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

package/out/sbvr-api/hooks.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runHooks = exports.addPureHook = exports.addSideEffectHook = exports.addHook = exports.getHooks = exports.rollbackRequestHooks = void 0;
-const Bluebird = require("bluebird");
 const _ = require("lodash");
 const control_flow_1 = require("./control-flow");
 const memoize = require("memoizee");
@@ -32,7 +31,13 @@ class SideEffectHook extends Hook {
     }
     registerRollback(fn) {
         if (this.rolledBack) {
-            Bluebird.try(fn);
+            (async () => {
+                try {
+                    await fn();
+                }
+                catch {
+                }
+            })();
         }
         else {
             this.rollbackFns.push(fn);
@@ -43,17 +48,21 @@ class SideEffectHook extends Hook {
             return;
         }
         this.rolledBack = true;
-        await control_flow_1.settleMapSeries(this.rollbackFns, (fn) => fn());
+        await (0, control_flow_1.settleMapSeries)(this.rollbackFns, (fn) => fn());
     }
 }
-const rollbackRequestHooks = (hooks) => {
-    if (hooks == null) {
+const rollbackRequestHooks = (hooksList) => {
+    if (hooksList == null) {
         return;
     }
-    control_flow_1.settleMapSeries(_(hooks).flatMap().compact().value(), async (hook) => {
-        if (hook instanceof SideEffectHook) {
-            await hook.rollback();
-        }
+    const sideEffectHooks = hooksList
+        .flatMap(([, v]) => Object.values(v).flat())
+        .filter((hook) => hook instanceof SideEffectHook);
+    if (sideEffectHooks.length === 0) {
+        return;
+    }
+    (0, control_flow_1.settleMapSeries)(sideEffectHooks, async (hook) => {
+        await hook.rollback();
     });
 };
 exports.rollbackRequestHooks = rollbackRequestHooks;
@@ -83,19 +92,24 @@ const getResourceHooks = (vocabHooks, resourceName) => {
     }
     return mergeHooks(vocabHooks[resourceName], vocabHooks['all']);
 };
-const getVocabHooks = (methodHooks, vocabulary, resourceName) => {
+const getVocabHooks = (methodHooks, vocabulary, resourceName, includeAllVocab) => {
     if (methodHooks == null) {
         return {};
     }
-    return mergeHooks(getResourceHooks(methodHooks[vocabulary], resourceName), getResourceHooks(methodHooks['all'], resourceName));
+    const vocabHooks = getResourceHooks(methodHooks[vocabulary], resourceName);
+    if (!includeAllVocab) {
+        return vocabHooks;
+    }
+    return mergeHooks(vocabHooks, getResourceHooks(methodHooks['all'], resourceName));
 };
-const getMethodHooks = memoize((method, vocabulary, resourceName) => mergeHooks(getVocabHooks(apiHooks[method], vocabulary, resourceName), getVocabHooks(apiHooks['all'], vocabulary, resourceName)), { primitive: true });
-const getHooks = (request) => {
+const getMethodHooks = memoize((method, vocabulary, resourceName, includeAllVocab) => mergeHooks(getVocabHooks(apiHooks[method], vocabulary, resourceName, includeAllVocab), getVocabHooks(apiHooks['all'], vocabulary, resourceName, includeAllVocab)), { primitive: true });
+const getHooks = (request, includeAllVocab) => {
     let { resourceName } = request;
     if (resourceName != null) {
-        resourceName = sbvr_utils_1.resolveSynonym(request);
+        resourceName = (0, sbvr_utils_1.resolveSynonym)(request)
+            .replace(/\$.*$/, '');
     }
-    return instantiateHooks(getMethodHooks(request.method, request.vocabulary, resourceName));
+    return instantiateHooks(getMethodHooks(request.method, request.vocabulary, resourceName, includeAllVocab));
 };
 exports.getHooks = getHooks;
 exports.getHooks.clear = () => getMethodHooks.clear();
@@ -111,7 +125,6 @@ const apiHooks = {
 };
 apiHooks.MERGE = apiHooks.PATCH;
 const addHook = (method, vocabulary, resourceName, hooks) => {
-    var _a, _b, _c;
     const methodHooks = apiHooks[method];
     if (methodHooks == null) {
         throw new Error('Unsupported method: ' + method);
@@ -124,14 +137,14 @@ const addHook = (method, vocabulary, resourceName, hooks) => {
     else {
         let abstractSqlModel;
         try {
-            abstractSqlModel = sbvr_utils_1.getAbstractSqlModel({ vocabulary });
+            abstractSqlModel = (0, sbvr_utils_1.getAbstractSqlModel)({ vocabulary });
         }
-        catch (_d) {
+        catch {
             throw new Error('Unknown api root: ' + vocabulary);
         }
         if (resourceName !== 'all') {
             const origResourceName = resourceName;
-            resourceName = sbvr_utils_1.resolveSynonym({ vocabulary, resourceName });
+            resourceName = (0, sbvr_utils_1.resolveSynonym)({ vocabulary, resourceName });
             if (abstractSqlModel.tables[resourceName] == null) {
                 throw new Error('Unknown resource for api root: ' +
                     origResourceName +
@@ -140,9 +153,9 @@ const addHook = (method, vocabulary, resourceName, hooks) => {
             }
         }
     }
-    (_a = methodHooks[vocabulary]) !== null && _a !== void 0 ? _a : (methodHooks[vocabulary] = {});
+    methodHooks[vocabulary] ??= {};
     const apiRootHooks = methodHooks[vocabulary];
-    (_b = apiRootHooks[resourceName]) !== null && _b !== void 0 ? _b : (apiRootHooks[resourceName] = {});
+    apiRootHooks[resourceName] ??= {};
     const resourceHooks = apiRootHooks[resourceName];
     if ('sideEffects' in hooks && 'readOnlyTx' in hooks) {
         const { sideEffects, readOnlyTx } = hooks;
@@ -164,7 +177,7 @@ const addHook = (method, vocabulary, resourceName, hooks) => {
             throw new Error('Unknown callback type: ' + hookType);
         }
         const hook = hooks[hookType];
-        (_c = resourceHooks[hookType]) !== null && _c !== void 0 ? _c : (resourceHooks[hookType] = []);
+        resourceHooks[hookType] ??= [];
         if (hook != null) {
             resourceHooks[hookType].push(hook);
         }
@@ -173,7 +186,7 @@ const addHook = (method, vocabulary, resourceName, hooks) => {
 };
 exports.addHook = addHook;
 const addSideEffectHook = (method, apiRoot, resourceName, hooks) => {
-    exports.addHook(method, apiRoot, resourceName, {
+    (0, exports.addHook)(method, apiRoot, resourceName, {
         ...hooks,
         sideEffects: true,
         readOnlyTx: false,
@@ -181,51 +194,64 @@ const addSideEffectHook = (method, apiRoot, resourceName, hooks) => {
 };
 exports.addSideEffectHook = addSideEffectHook;
 const addPureHook = (method, apiRoot, resourceName, hooks) => {
-    exports.addHook(method, apiRoot, resourceName, {
+    (0, exports.addHook)(method, apiRoot, resourceName, {
         ...hooks,
         sideEffects: false,
         readOnlyTx: false,
     });
 };
 exports.addPureHook = addPureHook;
-const defineApi = (args) => {
-    const { request, req, tx } = args;
-    const { vocabulary } = request;
+const defineApi = (modelName, args) => {
+    const { req, tx } = args;
     Object.defineProperty(args, 'api', {
-        get: _.once(() => sbvr_utils_1.api[vocabulary].clone({
+        get: _.once(() => sbvr_utils_1.api[modelName].clone({
             passthrough: { req, tx },
         })),
     });
 };
+const getReadOnlyArgs = (modelName, args) => {
+    if (args.tx == null || args.tx.isReadOnly()) {
+        return args;
+    }
+    let readOnlyArgs;
+    readOnlyArgs = { ...args, tx: args.tx.asReadOnly() };
+    if (args.request != null) {
+        defineApi(modelName, readOnlyArgs);
+    }
+    return readOnlyArgs;
+};
 const runHooks = async (hookName, hooksList, args) => {
     if (hooksList == null) {
         return;
     }
-    const hooks = hooksList[hookName];
-    if (hooks == null || hooks.length === 0) {
+    const hooks = hooksList
+        .map(([modelName, $hooks]) => [
+        modelName,
+        $hooks[hookName],
+    ])
+        .filter((v) => v[1] != null && v[1].length > 0);
+    if (hooks.length === 0) {
         return;
     }
-    let readOnlyArgs;
-    if (args.tx != null) {
-        readOnlyArgs = { ...args, tx: args.tx.asReadOnly() };
-    }
-    else {
-        readOnlyArgs = args;
+    if (['POSTRUN', 'PRERESPOND', 'POSTRUN-ERROR'].includes(hookName)) {
+        hooks.reverse();
     }
-    if (args.request != null) {
-        defineApi(args);
-        if (args !== readOnlyArgs) {
-            defineApi(readOnlyArgs);
+    for (const [modelName, modelHooks] of hooks) {
+        const modelArgs = { ...args };
+        let modelReadOnlyArgs;
+        if (args.request != null) {
+            defineApi(modelName, modelArgs);
         }
+        await Promise.all(modelHooks.map(async (hook) => {
+            if (hook.readOnlyTx) {
+                modelReadOnlyArgs ??= getReadOnlyArgs(modelName, modelArgs);
+                await hook.run(modelReadOnlyArgs);
+            }
+            else {
+                await hook.run(modelArgs);
+            }
+        }));
     }
-    await Promise.all(hooks.map(async (hook) => {
-        if (hook.readOnlyTx) {
-            await hook.run(readOnlyArgs);
-        }
-        else {
-            await hook.run(args);
-        }
-    }));
 };
 exports.runHooks = runHooks;
 //# sourceMappingURL=hooks.js.map

package/out/sbvr-api/hooks.js.map

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

package/out/sbvr-api/odata-response.d.ts

@@ -1,7 +1,7 @@
 declare module '@balena/abstract-sql-compiler' {
     interface AbstractSqlTable {
         fetchProcessingFields?: {
-            [field: string]: NonNullable<typeof sbvrTypes[string]['fetchProcessing']>;
+            [field: string]: NonNullable<SbvrType['fetchProcessing']>;
         };
         localFields?: {
             [odataName: string]: true;
@@ -10,7 +10,7 @@ declare module '@balena/abstract-sql-compiler' {
 }
 import type { AbstractSqlModel } from '@balena/abstract-sql-compiler';
 import type { Result, Row } from '../database-layer/db';
-import * as sbvrTypes from '@balena/sbvr-types';
+import { SbvrType } from '@balena/sbvr-types';
 export declare const resourceURI: (vocab: string, resourceName: string, id: string | number) => string | undefined;
 export declare const process: (vocab: string, abstractSqlModel: AbstractSqlModel, resourceName: string, rows: Result['rows'], { includeMetadata }: {
     includeMetadata: boolean;

package/out/sbvr-api/odata-response.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareModel = exports.process = exports.resourceURI = void 0;
 const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
-const sbvrTypes = require("@balena/sbvr-types");
+const sbvr_types_1 = require("@balena/sbvr-types");
 const _ = require("lodash");
 const sbvr_utils_1 = require("./sbvr-utils");
 const checkForExpansion = async (vocab, abstractSqlModel, parentResourceName, fieldName, row, opts) => {
@@ -14,30 +14,25 @@ const checkForExpansion = async (vocab, abstractSqlModel, parentResourceName, fi
         try {
             field = JSON.parse(field);
         }
-        catch (_e) {
+        catch {
         }
     }
+    const mappingResourceName = (0, sbvr_utils_1.resolveNavigationResource)({
+        abstractSqlModel,
+        vocabulary: vocab,
+        resourceName: parentResourceName,
+    }, fieldName);
     if (Array.isArray(field)) {
-        const mappingResourceName = sbvr_utils_1.resolveNavigationResource({
-            abstractSqlModel,
-            vocabulary: vocab,
-            resourceName: parentResourceName,
-        }, fieldName);
-        const expandedField = await exports.process(vocab, abstractSqlModel, mappingResourceName, field, opts);
+        const expandedField = await (0, exports.process)(vocab, abstractSqlModel, mappingResourceName, field, opts);
         row[fieldName] = expandedField;
     }
     else {
-        const mappingResourceName = sbvr_utils_1.resolveNavigationResource({
-            abstractSqlModel,
-            vocabulary: vocab,
-            resourceName: parentResourceName,
-        }, fieldName);
         row[fieldName] = {
             __id: field,
         };
         if (opts.includeMetadata) {
             row[fieldName].__deferred = {
-                uri: exports.resourceURI(vocab, mappingResourceName, field),
+                uri: (0, exports.resourceURI)(vocab, mappingResourceName, field),
             };
         }
     }
@@ -56,8 +51,8 @@ const getLocalFields = (table) => {
     if (table.localFields == null) {
         table.localFields = {};
         for (const { fieldName, dataType } of table.fields) {
-            if (dataType !== 'ForeignKey') {
-                const odataName = odata_to_abstract_sql_1.sqlNameToODataName(fieldName);
+            if (!['ForeignKey', 'ConceptType'].includes(dataType)) {
+                const odataName = (0, odata_to_abstract_sql_1.sqlNameToODataName)(fieldName);
                 table.localFields[odataName] = true;
             }
         }
@@ -65,16 +60,19 @@ const getLocalFields = (table) => {
     return table.localFields;
 };
 const getFetchProcessingFields = (table) => {
-    var _a;
-    return ((_a = table.fetchProcessingFields) !== null && _a !== void 0 ? _a : (table.fetchProcessingFields = _(table.fields)
-        .filter(({ dataType }) => sbvrTypes[dataType] != null &&
-        sbvrTypes[dataType].fetchProcessing != null)
+    return (table.fetchProcessingFields ??= _(table.fields)
+        .filter(({ dataType }) => sbvr_types_1.default[dataType]
+        ?.fetchProcessing != null)
         .map(({ fieldName, dataType }) => {
-        const odataName = odata_to_abstract_sql_1.sqlNameToODataName(fieldName);
-        return [odataName, sbvrTypes[dataType].fetchProcessing];
+        const odataName = (0, odata_to_abstract_sql_1.sqlNameToODataName)(fieldName);
+        return [
+            odataName,
+            sbvr_types_1.default[dataType]
+                .fetchProcessing,
+        ];
     })
         .fromPairs()
-        .value()));
+        .value());
 };
 const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMetadata }) => {
     if (rows.length === 0) {
@@ -86,7 +84,7 @@ const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMet
             return count;
         }
     }
-    const sqlResourceName = sbvr_utils_1.resolveSynonym({
+    const sqlResourceName = (0, sbvr_utils_1.resolveSynonym)({
         abstractSqlModel,
         vocabulary: vocab,
         resourceName,
@@ -97,17 +95,17 @@ const process = async (vocab, abstractSqlModel, resourceName, rows, { includeMet
     const processedFields = fieldNames.filter((fieldName) => fetchProcessingFields.hasOwnProperty(fieldName));
     const localFields = getLocalFields(table);
     const expandableFields = fieldNames.filter((fieldName) => !localFields.hasOwnProperty(fieldName));
-    const odataIdField = odata_to_abstract_sql_1.sqlNameToODataName(table.idField);
-    rows.forEach((row) => {
-        processedFields.forEach((fieldName) => {
+    const odataIdField = (0, odata_to_abstract_sql_1.sqlNameToODataName)(table.idField);
+    for (const row of rows) {
+        for (const fieldName of processedFields) {
             row[fieldName] = fetchProcessingFields[fieldName](row[fieldName]);
-        });
+        }
         if (includeMetadata) {
             row.__metadata = {
-                uri: exports.resourceURI(vocab, resourceName, row[odataIdField]),
+                uri: (0, exports.resourceURI)(vocab, resourceName, row[odataIdField]),
             };
         }
-    });
+    }
     if (expandableFields.length > 0) {
         await Promise.all(rows.map(async (row) => {
             await Promise.all(expandableFields.map(async (fieldName) => {

package/out/sbvr-api/odata-response.js.map

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

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

@@ -1,5 +1,6 @@
 import './express-extension';
 import type * as Express from 'express';
+import type { Tx } from '../database-layer/db';
 import type { ApiKey, User } from '../sbvr-api/sbvr-utils';
 import * as sbvrUtils from '../sbvr-api/sbvr-utils';
 import { HookReq } from './hooks';
@@ -20,28 +21,28 @@ interface NestedCheckAnd<T> {
 }
 interface NestedCheckArray<T> extends Array<NestedCheck<T>> {
 }
-declare type NestedCheck<T> = NestedCheckOr<T> | NestedCheckAnd<T> | NestedCheckArray<T> | T;
-declare type PermissionCheck = NestedCheck<string>;
-declare type MappedType<I, O> = O extends NestedCheck<infer T> ? Exclude<Exclude<I, string> | T, boolean> : Exclude<Exclude<I, string> | O, boolean>;
-declare type MappedNestedCheck<T extends NestedCheck<I>, I, O> = T extends NestedCheckOr<I> ? NestedCheckOr<MappedType<I, O>> : T extends NestedCheckAnd<I> ? NestedCheckAnd<MappedType<I, O>> : T extends NestedCheckArray<I> ? NestedCheckArray<MappedType<I, O>> : Exclude<I, string> | O;
-export declare function nestedCheck<I, O>(check: string, stringCallback: (s: string) => O): O;
-export declare function nestedCheck<I, O>(check: boolean, stringCallback: (s: string) => O): boolean;
-export declare function nestedCheck<I, O>(check: NestedCheck<I>, stringCallback: (s: string) => O): Exclude<I, string> | O | MappedNestedCheck<typeof check, I, O>;
+type NestedCheck<T> = NestedCheckOr<T> | NestedCheckAnd<T> | NestedCheckArray<T> | T;
+type PermissionCheck = NestedCheck<string>;
+type MappedType<I, O> = O extends NestedCheck<infer T> ? Exclude<Exclude<I, string> | T, boolean> : Exclude<Exclude<I, string> | O, boolean>;
+type MappedNestedCheck<T extends NestedCheck<I>, I, O> = T extends NestedCheckOr<I> ? NestedCheckOr<MappedType<I, O>> : T extends NestedCheckAnd<I> ? NestedCheckAnd<MappedType<I, O>> : T extends NestedCheckArray<I> ? NestedCheckArray<MappedType<I, O>> : Exclude<I, string> | O;
+export declare function nestedCheck<I extends {}, O>(check: string, stringCallback: (s: string) => O): O;
+export declare function nestedCheck<I extends {}, O>(check: boolean, stringCallback: (s: string) => O): boolean;
+export declare function nestedCheck<I extends {}, O>(check: NestedCheck<I>, stringCallback: (s: string) => O): Exclude<I, string> | O | MappedNestedCheck<typeof check, I, O>;
 export declare const checkPassword: (username: string, password: string) => Promise<{
     id: number;
     actor: number;
     username: string;
     permissions: string[];
 }>;
-export declare const getUserPermissions: (userId: number) => Promise<string[]>;
-export declare const getApiKeyPermissions: (apiKey: string) => Promise<string[]>;
-export declare const resolveAuthHeader: (req: Express.Request, expectedScheme?: string) => Promise<PermissionReq['apiKey']>;
-export declare const customAuthorizationMiddleware: (expectedScheme?: string) => (req: Express.Request, _res?: Express.Response<any, Record<string, any>> | undefined, next?: Express.NextFunction | undefined) => Promise<void>;
-export declare const authorizationMiddleware: (req: Express.Request, _res?: Express.Response<any, Record<string, any>> | undefined, next?: Express.NextFunction | undefined) => Promise<void>;
-export declare const resolveApiKey: (req: HookReq | Express.Request, paramName?: string) => Promise<PermissionReq['apiKey']>;
-export declare const customApiKeyMiddleware: (paramName?: string) => (req: HookReq | Express.Request, _res?: Express.Response<any, Record<string, any>> | undefined, next?: Express.NextFunction | undefined) => Promise<void>;
-export declare const apiKeyMiddleware: (req: HookReq | Express.Request, _res?: Express.Response<any, Record<string, any>> | undefined, next?: Express.NextFunction | undefined) => Promise<void>;
-export declare const checkPermissions: (req: PermissionReq, actionList: PermissionCheck, resourceName?: string | undefined, vocabulary?: string | undefined) => Promise<boolean | NestedCheck<string>>;
+export declare const getUserPermissions: (userId: number, tx?: Tx) => Promise<string[]>;
+export declare const getApiKeyPermissions: (apiKey: string, tx?: Tx) => Promise<string[]>;
+export declare const resolveAuthHeader: (req: Express.Request, expectedScheme?: string, tx?: Tx) => Promise<PermissionReq['apiKey']>;
+export declare const customAuthorizationMiddleware: (expectedScheme?: string) => (req: Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
+export declare const authorizationMiddleware: (req: Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
+export declare const resolveApiKey: (req: HookReq | Express.Request, paramName?: string, tx?: Tx) => Promise<PermissionReq['apiKey']>;
+export declare const customApiKeyMiddleware: (paramName?: string) => (req: HookReq | Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
+export declare const apiKeyMiddleware: (req: HookReq | Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
+export declare const checkPermissions: (req: PermissionReq, actionList: PermissionCheck, resourceName?: string, vocabulary?: string) => Promise<boolean | NestedCheck<string>>;
 export declare const checkPermissionsMiddleware: (action: PermissionCheck) => Express.RequestHandler;
 export declare const addPermissions: (req: PermissionReq, request: ODataRequest & {
     permissionType?: PermissionCheck;