@balena/pinejs 15.0.0-true-boolean-911aca4062d3132ad3c34712014739b6849fa13a → 15.0.0

package/out/pinejs-session-store/pinejs-session-store.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PinejsSessionStore = exports.Store = void 0;
 const express_session_1 = require("express-session");
@@ -37,9 +38,9 @@ const asCallback = async (callback, promise) => {
         err = $err;
     }
     try {
-        callback === null || callback === void 0 ? void 0 : callback(err, result);
+        callback?.(err, result);
     }
-    catch (_a) {
+    catch {
     }
 };
 class PinejsSessionStore extends express_session_1.Store {
@@ -64,11 +65,10 @@ class PinejsSessionStore extends express_session_1.Store {
             }));
         });
         this.set = ((sid, data, callback) => {
-            var _a, _b;
             const body = {
                 session_id: sid,
                 data,
-                expiry_time: (_b = (_a = data === null || data === void 0 ? void 0 : data.cookie) === null || _a === void 0 ? void 0 : _a.expires) !== null && _b !== void 0 ? _b : null,
+                expiry_time: data?.cookie?.expires ?? null,
             };
             asCallback(callback, sbvr_utils_1.api.session.put({
                 resource: 'session',
@@ -120,7 +120,6 @@ class PinejsSessionStore extends express_session_1.Store {
                 },
                 options: {
                     $count: {
-                        $select: 'session_id',
                         $filter: {
                             expiry_time: {
                                 $ge: Date.now(),
@@ -132,7 +131,7 @@ class PinejsSessionStore extends express_session_1.Store {
         });
     }
 }
-exports.PinejsSessionStore = PinejsSessionStore;
+_a = PinejsSessionStore;
 PinejsSessionStore.config = {
     models: [
         {
@@ -148,8 +147,23 @@ PinejsSessionStore.config = {
 						ALTER TABLE "session"
 						ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
 					`,
+                '15.0.0-data-types': async (tx, sbvrUtils) => {
+                    switch (sbvrUtils.db.engine) {
+                        case 'mysql':
+                            await tx.executeSql(`\
+									ALTER TABLE "session"
+									MODIFY "data" JSON NOT NULL;`);
+                            break;
+                        case 'postgres':
+                            await tx.executeSql(`\
+									ALTER TABLE "session"
+									ALTER COLUMN "data" SET DATA TYPE JSONB USING "data"::JSONB;`);
+                            break;
+                    }
+                },
             },
         },
     ],
 };
+exports.PinejsSessionStore = PinejsSessionStore;
 //# sourceMappingURL=pinejs-session-store.js.map

package/out/pinejs-session-store/pinejs-session-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":";;;;AAGA,qDAAwC;AAI/B,sFAJA,uBAAK,OAIA;AAHd,uDAAuD;AACvD,uDAA6C;AAI7C,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;CAqBpB,CAAC;AAEF,MAAM,UAAU,GAAG,KAAK,EACvB,QAAsD,EACtD,OAAmB,EAClB,EAAE;IACH,IAAI,GAAG,CAAC;IACR,IAAI,MAAM,CAAC;IACX,IAAI;QACH,MAAM,GAAG,MAAM,OAAO,CAAC;KACvB;IAAC,OAAO,IAAI,EAAE;QACd,GAAG,GAAG,IAAI,CAAC;KACX;IACD,IAAI;QACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACxB;IAAC,MAAM;KAEP;AACF,CAAC,CAAC;AAEF,MAAa,kBAAmB,SAAQ,uBAAK;IAA7C;;QACQ,QAAG,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;YAC/B,UAAU,CACT,QAAQ,EACR,gBAAG,CAAC,OAAO;iBACT,GAAG,CAAC;gBACJ,QAAQ,EAAE,SAAS;gBACnB,EAAE,EAAE,GAAG;gBACP,WAAW,EAAE;oBACZ,GAAG,EAAE,WAAW,CAAC,QAAQ;iBACzB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,MAAM;iBACf;aACD,CAAC;iBACD,IAAI,CAAC,CAAC,OAAkB,EAAE,EAAE;gBAC5B,IAAI,OAAO,IAAI,IAAI,EAAE;oBACpB,OAAO,OAAO,CAAC,IAAI,CAAC;iBACpB;YACF,CAAC,CAAC,CACH,CAAC;QACH,CAAC,CAAiB,CAAC;QAEZ,QAAG,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;YACrC,MAAM,IAAI,GAAG;gBACZ,UAAU,EAAE,GAAG;gBACf,IAAI;gBACJ,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,IAAI,IAAI;aAC1C,CAAC;YACF,UAAU,CACT,QAAQ,EACR,gBAAG,CAAC,OAAO,CAAC,GAAG,CAAC;gBACf,QAAQ,EAAE,SAAS;gBACnB,EAAE,EAAE,GAAG;gBACP,WAAW,EAAE;oBACZ,GAAG,EAAE,WAAW,CAAC,IAAI;iBACrB;gBACD,IAAI;aACJ,CAAC,CACF,CAAC;QACH,CAAC,CAAiB,CAAC;QAEZ,YAAO,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;YACnC,UAAU,CACT,QAAQ,EACR,gBAAG,CAAC,OAAO,CAAC,MAAM,CAAC;gBAClB,QAAQ,EAAE,SAAS;gBACnB,EAAE,EAAE,GAAG;gBACP,WAAW,EAAE;oBACZ,GAAG,EAAE,WAAW,CAAC,IAAI;iBACrB;aACD,CAAC,CACF,CAAC;QACH,CAAC,CAAqB,CAAC;QAEhB,QAAG,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC1B,UAAU,CACT,QAAQ,EACR,gBAAG,CAAC,OAAO;iBACT,GAAG,CAAC;gBACJ,QAAQ,EAAE,SAAS;gBACnB,WAAW,EAAE;oBACZ,GAAG,EAAE,WAAW,CAAC,IAAI;iBACrB;gBACD,OAAO,EAAE;oBACR,OAAO,EAAE,YAAY;oBACrB,OAAO,EAAE;wBACR,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE;qBAChC;iBACD;aACD,CAAC;iBACD,IAAI,CAAC,CAAC,QAAqB,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CACpE,CAAC;QACH,CAAC,CAAiB,CAAC;QAEZ,UAAK,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC5B,UAAU,CACT,QAAQ,EAER,gBAAG,CAAC,OAAO,CAAC,MAAM,CAAC;gBAClB,QAAQ,EAAE,SAAS;gBACnB,WAAW,EAAE;oBACZ,GAAG,EAAE,WAAW,CAAC,IAAI;iBACrB;aACD,CAAC,CACF,CAAC;QACH,CAAC,CAAmB,CAAC;QAEd,WAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC7B,UAAU,CACT,QAAQ,EACR,gBAAG,CAAC,OAAO,CAAC,GAAG,CAAC;gBACf,QAAQ,EAAE,UAAU;gBACpB,WAAW,EAAE;oBACZ,GAAG,EAAE,WAAW,CAAC,QAAQ;iBACzB;gBACD,OAAO,EAAE;oBACR,MAAM,EAAE;wBACP,OAAO,EAAE;4BACR,WAAW,EAAE;gCACZ,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE;6BACf;yBACD;qBACD;iBACD;aACD,CAAoB,CACrB,CAAC;QACH,CAAC,CAAoB,CAAC;IAoCvB,CAAC;;;AAlCc,yBAAM,GAAW;IAC9B,MAAM,EAAE;QACP;YACC,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,YAAY;YACvB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE;gBACR,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,IAAI;aACX;YACD,UAAU,EAAE;gBACX,oBAAoB,EAAE;;;MAGrB;gBACD,mBAAmB,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE;oBAC5C,QAAQ,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE;wBAC5B,KAAK,OAAO;4BACX,MAAM,EAAE,CAAC,UAAU,CAAC;;sCAEU,CAAC,CAAC;4BAChC,MAAM;wBACP,KAAK,UAAU;4BACd,MAAM,EAAE,CAAC,UAAU,CAAC;;sEAE0C,CAAC,CAAC;4BAChE,MAAM;qBAEP;gBACF,CAAC;aACD;SACD;KACD;CACD,AAjCmB,CAiClB;AA9IU,gDAAkB"}

package/out/sbvr-api/abstract-sql.d.ts

@@ -1,7 +1,8 @@
 import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
 import { ODataBinds } from '@balena/odata-to-abstract-sql';
+import * as sbvrUtils from './sbvr-utils';
 import { ODataRequest } from './uri-parser';
-export declare const compileRequest: (request: ODataRequest) => ODataRequest;
+export declare const compileRequest: (request: ODataRequest) => sbvrUtils.ODataRequest;
 export declare const resolveOdataBind: (odataBinds: ODataBinds, value: any) => any;
 export declare const getAndCheckBindValues: (request: Required<Pick<ODataRequest, 'vocabulary' | 'odataBinds' | 'values' | 'engine'>>, bindings: AbstractSQLCompiler.Binding[]) => Promise<any[]>;
-export declare const isRuleAffected: (rule: AbstractSQLCompiler.SqlRule, request?: ODataRequest | undefined) => boolean;
+export declare const isRuleAffected: (rule: AbstractSQLCompiler.SqlRule, request?: Pick<ODataRequest, 'abstractSqlQuery' | 'modifiedFields' | 'method' | 'vocabulary'>) => boolean;

package/out/sbvr-api/abstract-sql.js

@@ -6,11 +6,10 @@ const AbstractSQLCompiler = require("@balena/abstract-sql-compiler");
 const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
 const deepFreeze = require("deep-freeze");
 const memoize = require("memoizee");
-const memoizeWeak = require("memoizee/weak");
 const env = require("../config-loader/env");
 const errors_1 = require("./errors");
 const sbvrUtils = require("./sbvr-utils");
-const getMemoizedCompileRule = memoize((engine) => memoizeWeak((abstractSqlQuery) => {
+const getMemoizedCompileRule = memoize((engine) => env.createCache('abstractSqlCompiler', (abstractSqlQuery) => {
     const sqlQuery = AbstractSQLCompiler[engine].compileRule(abstractSqlQuery);
     const modifiedFields = AbstractSQLCompiler[engine].getModifiedFields(abstractSqlQuery);
     if (modifiedFields != null) {
@@ -20,7 +19,7 @@ const getMemoizedCompileRule = memoize((engine) => memoizeWeak((abstractSqlQuery
         sqlQuery,
         modifiedFields,
     };
-}, { max: env.cache.abstractSqlCompiler.max }), { primitive: true });
+}, { weak: true }), { primitive: true });
 const compileRequest = (request) => {
     if (request.abstractSqlQuery != null) {
         const { engine } = request;
@@ -41,7 +40,7 @@ const compileRequest = (request) => {
 };
 exports.compileRequest = compileRequest;
 const resolveOdataBind = (odataBinds, value) => {
-    if (value != null && typeof value === 'object' && odata_to_abstract_sql_1.isBindReference(value)) {
+    if (value != null && typeof value === 'object' && (0, odata_to_abstract_sql_1.isBindReference)(value)) {
         [, value] = odataBinds[value.bind];
     }
     return value;
@@ -64,10 +63,11 @@ const getAndCheckBindValues = async (request, bindings) => {
                 if (value === undefined) {
                     value = values[fieldName];
                 }
-                value = exports.resolveOdataBind(odataBinds, value);
-                const sqlTableName = odata_to_abstract_sql_1.odataNameToSqlName(tableName);
-                const sqlFieldName = odata_to_abstract_sql_1.odataNameToSqlName(fieldName);
-                const maybeField = sqlModelTables[sqlTableName].fields.find((f) => f.fieldName === sqlFieldName);
+                value = (0, exports.resolveOdataBind)(odataBinds, value);
+                const sqlTableName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(tableName);
+                const sqlFieldName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(fieldName);
+                const table = sqlModelTables[sqlTableName];
+                const maybeField = (table.modifyFields ?? table.fields).find((f) => f.fieldName === sqlFieldName);
                 if (maybeField == null) {
                     throw new Error(`Could not find field '${fieldName}'`);
                 }
@@ -127,7 +127,7 @@ const checkModifiedFields = (ruleReferencedFields, modifiedFields) => {
         0);
 };
 const isRuleAffected = (rule, request) => {
-    if ((request === null || request === void 0 ? void 0 : request.abstractSqlQuery) == null) {
+    if (request?.abstractSqlQuery == null) {
         return false;
     }
     if (rule.ruleReferencedFields == null) {

package/out/sbvr-api/abstract-sql.js.map

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

package/out/sbvr-api/cached-compile.js

@@ -32,7 +32,7 @@ const cachedCompile = (name, version, src, fn) => {
             catch (e) {
             }
         }
-        cache !== null && cache !== void 0 ? cache : (cache = {});
+        cache ??= {};
     }
     const key = [name, version, JSON.stringify(src)];
     let result = _.get(cache, key);

package/out/sbvr-api/cached-compile.js.map

@@ -1 +1 @@
-{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;AACxE,IAAI,KAAK,GAML,IAAI,CAAC;AACT,IAAI,EAAyB,CAAC;AAC9B,IAAI;IAEH,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAAC,OAAO,CAAC,EAAE;CAEX;AAED,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IACjC,IAAI,EAAE,IAAI,IAAI,EAAE;QACf,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAI,GAAG,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;aAChD;QACF,CAAC,CAAC,CAAC;KACH;AACF,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEvB,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IAClC,KAAK,GAAG,IAAI,CAAC;AACd,CAAC,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAC;AAEpB,MAAM,aAAa,GAAG,CAC5B,IAAY,EACZ,OAAe,EACf,GAAQ,EACR,EAAW,EACP,EAAE;IACN,IAAI,KAAK,IAAI,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,IAAI,EAAE;YACf,IAAI;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;aACvD;YAAC,OAAO,CAAC,EAAE;aAEX;SACD;QACD,KAAK,aAAL,KAAK,cAAL,KAAK,IAAL,KAAK,GAAK,EAAE,EAAC;KACb;IACD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,IAAI,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,IAAI,IAAI,EAAE;QACnB,MAAM,GAAG,EAAE,EAAE,CAAC;QACd,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC;KACZ;IAKD,UAAU,EAAE,CAAC;IACb,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC,CAAC;AA7BW,QAAA,aAAa,iBA6BxB"}
+{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAE5B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;AACxE,IAAI,KAAK,GAML,IAAI,CAAC;AACT,IAAI,EAAyB,CAAC;AAC9B,IAAI;IAEH,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAAC,OAAO,CAAC,EAAE;CAEX;AAED,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IACjC,IAAI,EAAE,IAAI,IAAI,EAAE;QACf,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAI,GAAG,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;aAChD;QACF,CAAC,CAAC,CAAC;KACH;AACF,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEvB,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IAClC,KAAK,GAAG,IAAI,CAAC;AACd,CAAC,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAC;AAEpB,MAAM,aAAa,GAAG,CAC5B,IAAY,EACZ,OAAe,EACf,GAAQ,EACR,EAAW,EACP,EAAE;IACN,IAAI,KAAK,IAAI,IAAI,EAAE;QAClB,IAAI,EAAE,IAAI,IAAI,EAAE;YACf,IAAI;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;aACvD;YAAC,OAAO,CAAC,EAAE;aAEX;SACD;QACD,KAAK,KAAK,EAAE,CAAC;KACb;IACD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,IAAI,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,IAAI,IAAI,EAAE;QACnB,MAAM,GAAG,EAAE,EAAE,CAAC;QACd,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC;KACZ;IAKD,UAAU,EAAE,CAAC;IACb,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC,CAAC;AA7BW,QAAA,aAAa,iBA6BxB"}

package/out/sbvr-api/common-types.d.ts

@@ -1,5 +1,6 @@
-export { AnyObject } from 'pinejs-client-core';
-declare type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;
-export declare type RequiredField<T, F extends keyof T> = Overwrite<T, Required<Pick<T, F>>>;
-export declare type OptionalField<T, F extends keyof T> = Overwrite<T, Partial<Pick<T, F>>>;
-export declare type Resolvable<R> = R | PromiseLike<R>;
+export { AnyObject, Dictionary } from 'pinejs-client-core';
+type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;
+export type RequiredField<T, F extends keyof T> = Overwrite<T, Required<Pick<T, F>>>;
+export type OptionalField<T, F extends keyof T> = Overwrite<T, Partial<Pick<T, F>>>;
+export type Resolvable<R> = R | PromiseLike<R>;
+export type Tail<T extends any[]> = T extends [any, ...infer U] ? U : never;

package/out/sbvr-api/control-flow.d.ts

@@ -1,7 +1,14 @@
 import type { Resolvable } from './common-types';
-export declare type MappingFunction = <T, U>(a: T[], fn: (v: T) => Resolvable<U>) => Promise<Array<U | Error>>;
+import { TypedError } from 'typed-error';
+export type MappingFunction = <T, U>(a: T[], fn: (v: T) => Resolvable<U>) => Promise<Array<U | Error>>;
+export declare const mapSeries: <T, U>(a: T[], fn: (v: T) => Resolvable<U>) => Promise<U[]>;
 export declare const settleMapSeries: MappingFunction;
 export declare const getMappingFn: (headers?: {
     [key: string]: string | string[] | undefined;
     prefer?: string | string[] | undefined;
 } | undefined) => MappingFunction;
+export declare const delay: (ms: number) => Promise<void>;
+export declare const fromCallback: <T>(resolver: (callback: (err: any, result?: T | undefined) => void) => void) => Promise<T>;
+export declare class TimeoutError extends TypedError {
+}
+export declare const timeout: <T>(promise: Promise<T>, ms: number, msg?: string) => Promise<T>;

package/out/sbvr-api/control-flow.js

@@ -1,20 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMappingFn = exports.settleMapSeries = void 0;
+exports.timeout = exports.TimeoutError = exports.fromCallback = exports.delay = exports.getMappingFn = exports.settleMapSeries = exports.mapSeries = void 0;
 const _ = require("lodash");
-const settleMapSeries = async (a, fn) => {
+const typed_error_1 = require("typed-error");
+const mapSeries = async (a, fn) => {
     const results = [];
     for (const p of a) {
-        try {
-            const result = await fn(p);
-            results.push(result);
-        }
-        catch (err) {
-            results.push(ensureError(err));
-        }
+        results.push(await fn(p));
     }
     return results;
 };
+exports.mapSeries = mapSeries;
+const settleMapSeries = async (a, fn) => await (0, exports.mapSeries)(a, async (p) => {
+    try {
+        return await fn(p);
+    }
+    catch (err) {
+        return ensureError(err);
+    }
+});
 exports.settleMapSeries = settleMapSeries;
 const ensureError = (err) => {
     if (err instanceof Error || _.isError(err)) {
@@ -45,4 +49,27 @@ const getMappingFn = (headers) => {
     }
 };
 exports.getMappingFn = getMappingFn;
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+exports.delay = delay;
+const fromCallback = (resolver) => new Promise((resolve, reject) => {
+    resolver((err, result) => {
+        if (err) {
+            reject(err);
+        }
+        else {
+            resolve(result);
+        }
+    });
+});
+exports.fromCallback = fromCallback;
+class TimeoutError extends typed_error_1.TypedError {
+}
+exports.TimeoutError = TimeoutError;
+const timeout = async (promise, ms, msg = 'operation timed out') => await Promise.race([
+    promise,
+    (0, exports.delay)(ms).then(() => {
+        throw new TimeoutError(msg);
+    }),
+]);
+exports.timeout = timeout;
 //# sourceMappingURL=control-flow.js.map

package/out/sbvr-api/control-flow.js.map

@@ -1 +1 @@
-{"version":3,"file":"control-flow.js","sourceRoot":"","sources":["../../src/sbvr-api/control-flow.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAQrB,MAAM,eAAe,GAAoB,KAAK,EACpD,CAAM,EACN,EAA2B,EAC1B,EAAE;IACH,MAAM,OAAO,GAAqB,EAAE,CAAC;IACrC,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE;QAClB,IAAI;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrB;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/B;KACD;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAdW,QAAA,eAAe,mBAc1B;AAGF,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAS,EAAE;IACvC,IAAI,GAAG,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC3C,OAAO,GAAG,CAAC;KACX;IACD,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC;AAKF,MAAM,OAAO,GAAoB,KAAK,EACrC,CAAM,EACN,EAA2B,EAC1B,EAAE;IACH,MAAM,OAAO,GAAqB,EAAE,CAAC;IACrC,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE;QAClB,IAAI;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrB;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/B,MAAM;SACN;KACD;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAIK,MAAM,YAAY,GAAG,CAAC,OAG5B,EAAmB,EAAE;IACrB,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,yBAAyB,EAAE;QACpE,OAAO,uBAAe,CAAC;KACvB;SAAM;QACN,OAAO,OAAO,CAAC;KACf;AACF,CAAC,CAAC;AATW,QAAA,YAAY,gBASvB"}
+{"version":3,"file":"control-flow.js","sourceRoot":"","sources":["../../src/sbvr-api/control-flow.ts"],"names":[],"mappings":"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"}

package/out/sbvr-api/errors.d.ts

@@ -1,4 +1,4 @@
-import type { AnyObject } from './common-types';
+import type { AnyObject, Tail } from './common-types';
 import { TypedError } from 'typed-error';
 export declare class PermissionError extends TypedError {
 }
@@ -15,122 +15,128 @@ export declare class ParsingError extends TypedError {
 export declare class HttpError extends TypedError {
     status: number;
     body?: string | AnyObject | undefined;
-    constructor(status: number, error?: string | Error, body?: string | AnyObject | undefined);
+    headers?: {
+        [headerName: string]: any;
+    } | undefined;
+    constructor(status: number, error?: string | Error, body?: string | AnyObject | undefined, headers?: {
+        [headerName: string]: any;
+    } | undefined);
     getResponseBody(): string | AnyObject;
 }
+type HttpErrorTailArgs = Tail<ConstructorParameters<typeof HttpError>>;
 export declare class BadRequestError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class UnauthorizedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class PaymentRequired extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class ForbiddenError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class NotFoundError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class MethodNotAllowedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class NotAcceptableError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class ProxyAuthenticationRequiredError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class RequestTimeoutError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class ConflictError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class GoneError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class LengthRequiredError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class PreconditionFailedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class PayloadTooLargeError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class URITooLongError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class UnsupportedMediaTypeError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class RequestedRangeNotSatisfiableError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class ExpectationFailedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class MisdirectedRequestError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class UnprocessableEntityError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class LockedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class FailedDependencyError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class UpgradeRequiredError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class PreconditionRequiredError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class TooManyRequestsError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class RequestHeaderFieldsTooLargeError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class UnavailableForLegalReasonsError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class InternalRequestError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class NotImplementedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class BadGatewayError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class ServiceUnavailableError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class GatewayTimeoutError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class HTTPVersionNotSupportedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class VariantAlsoNegotiatesError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class InsufficientStorageError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class LoopDetectedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class NotExtendedError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare class NetworkAuthenticationRequiredError extends HttpError {
-    constructor(error?: string | Error, body?: string | AnyObject);
+    constructor(...args: HttpErrorTailArgs);
 }
 export declare const statusCodeToError: {
     400: typeof BadRequestError;
@@ -172,3 +178,4 @@ export declare const statusCodeToError: {
     510: typeof NotExtendedError;
     511: typeof NetworkAuthenticationRequiredError;
 };
+export {};