@balena/pinejs 19.7.2-build-esm-36f468424324d7ef7578ae401fc681c9f8f63e03-3 → 19.7.2-build-update-deps-a909ee054f395de407ec4e1275fd0f5b7514fe29-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.versionbot/CHANGELOG.yml +3 -3
- package/CHANGELOG.md +1 -1
- package/{Gruntfile.cts → Gruntfile.ts} +22 -9
- package/bin/abstract-sql-compiler.js +1 -1
- package/bin/odata-compiler.js +1 -1
- package/bin/sbvr-compiler.js +1 -1
- package/build/{browser.cts → browser.ts} +1 -1
- package/build/{config.cts → config.ts} +1 -5
- package/build/{module.cts → module.ts} +1 -1
- package/build/{server.cts → server.ts} +1 -1
- package/out/bin/abstract-sql-compiler.js +19 -17
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/odata-compiler.js +21 -19
- package/out/bin/odata-compiler.js.map +1 -1
- package/out/bin/sbvr-compiler.js +54 -19
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/bin/utils.d.ts +3 -3
- package/out/bin/utils.js +53 -21
- package/out/bin/utils.js.map +1 -1
- package/out/config-loader/config-loader.d.ts +7 -7
- package/out/config-loader/config-loader.js +63 -23
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/config-loader/env.d.ts +1 -1
- package/out/config-loader/env.js +66 -24
- package/out/config-loader/env.js.map +1 -1
- package/out/data-server/sbvr-server.d.ts +3 -3
- package/out/data-server/sbvr-server.js +42 -5
- package/out/data-server/sbvr-server.js.map +1 -1
- package/out/database-layer/db.d.ts +3 -3
- package/out/database-layer/db.js +83 -37
- package/out/database-layer/db.js.map +1 -1
- package/out/express-emulator/express.js.map +1 -1
- package/out/extended-sbvr-parser/extended-sbvr-parser.js +11 -8
- package/out/extended-sbvr-parser/extended-sbvr-parser.js.map +1 -1
- package/out/http-transactions/transactions.d.ts +2 -2
- package/out/http-transactions/transactions.js +4 -4
- package/out/http-transactions/transactions.js.map +1 -1
- package/out/migrator/async.d.ts +2 -2
- package/out/migrator/async.js +60 -20
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/migrations.js +2 -1
- package/out/migrator/sync.d.ts +6 -6
- package/out/migrator/sync.js +61 -20
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +4 -4
- package/out/migrator/utils.js +97 -42
- package/out/migrator/utils.js.map +1 -1
- package/out/odata-metadata/odata-metadata-generator.js +14 -7
- package/out/odata-metadata/odata-metadata-generator.js.map +1 -1
- package/out/passport-pinejs/mount-login-router.d.ts +1 -1
- package/out/passport-pinejs/mount-login-router.js +41 -4
- package/out/passport-pinejs/mount-login-router.js.map +1 -1
- package/out/passport-pinejs/passport-pinejs.d.ts +3 -3
- package/out/passport-pinejs/passport-pinejs.js +46 -11
- package/out/passport-pinejs/passport-pinejs.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.d.ts +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js +48 -11
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.d.ts +3 -3
- package/out/sbvr-api/abstract-sql.js +65 -22
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/cached-compile.js +15 -8
- package/out/sbvr-api/cached-compile.js.map +1 -1
- package/out/sbvr-api/common-types.js +2 -1
- package/out/sbvr-api/control-flow.d.ts +1 -1
- package/out/sbvr-api/control-flow.js +25 -12
- package/out/sbvr-api/control-flow.js.map +1 -1
- package/out/sbvr-api/dev.js +2 -1
- package/out/sbvr-api/errors.d.ts +1 -1
- package/out/sbvr-api/errors.js +95 -47
- package/out/sbvr-api/errors.js.map +1 -1
- package/out/sbvr-api/express-extension.d.ts +2 -2
- package/out/sbvr-api/express-extension.js +2 -1
- package/out/sbvr-api/hooks.d.ts +4 -4
- package/out/sbvr-api/hooks.js +35 -23
- package/out/sbvr-api/hooks.js.map +1 -1
- package/out/sbvr-api/odata-response.d.ts +2 -2
- package/out/sbvr-api/odata-response.js +29 -19
- package/out/sbvr-api/odata-response.js.map +1 -1
- package/out/sbvr-api/permissions.d.ts +9 -9
- package/out/sbvr-api/permissions.js +159 -106
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +18 -40
- package/out/sbvr-api/sbvr-utils.js +285 -222
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/translations.d.ts +1 -1
- package/out/sbvr-api/translations.js +17 -10
- package/out/sbvr-api/translations.js.map +1 -1
- package/out/sbvr-api/uri-parser.d.ts +7 -7
- package/out/sbvr-api/uri-parser.js +84 -39
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/out/sbvr-api/user.js +2 -1
- package/out/server-glue/global-ext.d.ts +3 -0
- package/out/server-glue/module.d.ts +16 -16
- package/out/server-glue/module.js +59 -20
- package/out/server-glue/module.js.map +1 -1
- package/out/server-glue/sbvr-loader.d.ts +1 -2
- package/out/server-glue/sbvr-loader.js +11 -4
- package/out/server-glue/sbvr-loader.js.map +1 -1
- package/out/server-glue/server.d.ts +2 -2
- package/out/server-glue/server.js +59 -17
- package/out/server-glue/server.js.map +1 -1
- package/out/tasks/common.d.ts +1 -1
- package/out/tasks/common.js +9 -3
- package/out/tasks/common.js.map +1 -1
- package/out/tasks/index.d.ts +8 -8
- package/out/tasks/index.js +63 -25
- package/out/tasks/index.js.map +1 -1
- package/out/tasks/tasks.js +2 -1
- package/out/tasks/worker.d.ts +3 -3
- package/out/tasks/worker.js +51 -14
- package/out/tasks/worker.js.map +1 -1
- package/out/webresource-handler/handlers/NoopHandler.d.ts +1 -1
- package/out/webresource-handler/handlers/NoopHandler.js +5 -1
- package/out/webresource-handler/handlers/NoopHandler.js.map +1 -1
- package/out/webresource-handler/handlers/S3Handler.d.ts +1 -1
- package/out/webresource-handler/handlers/S3Handler.js +24 -17
- package/out/webresource-handler/handlers/S3Handler.js.map +1 -1
- package/out/webresource-handler/handlers/index.d.ts +2 -2
- package/out/webresource-handler/handlers/index.js +18 -2
- package/out/webresource-handler/handlers/index.js.map +1 -1
- package/out/webresource-handler/index.d.ts +3 -3
- package/out/webresource-handler/index.js +85 -35
- package/out/webresource-handler/index.js.map +1 -1
- package/package.json +33 -33
- package/src/bin/abstract-sql-compiler.ts +3 -3
- package/src/bin/odata-compiler.ts +3 -3
- package/src/bin/sbvr-compiler.ts +2 -2
- package/src/bin/utils.ts +15 -23
- package/src/config-loader/config-loader.ts +12 -12
- package/src/config-loader/env.ts +3 -3
- package/src/data-server/sbvr-server.ts +4 -4
- package/src/database-layer/db.ts +11 -18
- package/src/extended-sbvr-parser/extended-sbvr-parser.ts +5 -5
- package/src/http-transactions/transactions.js +4 -4
- package/src/migrator/async.ts +5 -5
- package/src/migrator/sync.ts +8 -8
- package/src/migrator/utils.ts +7 -7
- package/src/odata-metadata/odata-metadata-generator.ts +2 -3
- package/src/passport-pinejs/mount-login-router.ts +3 -3
- package/src/passport-pinejs/passport-pinejs.ts +6 -6
- package/src/pinejs-session-store/pinejs-session-store.ts +4 -4
- package/src/sbvr-api/abstract-sql.ts +6 -6
- package/src/sbvr-api/cached-compile.ts +2 -2
- package/src/sbvr-api/control-flow.ts +1 -1
- package/src/sbvr-api/errors.ts +1 -1
- package/src/sbvr-api/express-extension.ts +2 -2
- package/src/sbvr-api/hooks.ts +5 -5
- package/src/sbvr-api/odata-response.ts +4 -8
- package/src/sbvr-api/permissions.ts +19 -19
- package/src/sbvr-api/sbvr-utils.ts +33 -39
- package/src/sbvr-api/translations.ts +1 -1
- package/src/sbvr-api/uri-parser.ts +10 -10
- package/src/server-glue/global-ext.d.ts +3 -0
- package/src/server-glue/module.ts +20 -20
- package/src/server-glue/sbvr-loader.ts +27 -15
- package/src/server-glue/server.ts +24 -13
- package/src/tasks/common.ts +1 -1
- package/src/tasks/index.ts +14 -14
- package/src/tasks/worker.ts +8 -8
- package/src/webresource-handler/handlers/NoopHandler.ts +1 -5
- package/src/webresource-handler/handlers/S3Handler.ts +1 -1
- package/src/webresource-handler/handlers/index.ts +2 -2
- package/src/webresource-handler/index.ts +10 -10
- package/tsconfig.dev.json +2 -4
- package/tsconfig.json +1 -1
- package/typings/lf-to-abstract-sql.d.ts +2 -2
- package/typings/memoizee.d.ts +2 -2
@@ -1,3 +1,3 @@
|
|
1
1
|
import type { Express } from 'express';
|
2
|
-
import type { setup } from '../config-loader/config-loader
|
2
|
+
import type { setup } from '../config-loader/config-loader';
|
3
3
|
export declare const mountLoginRouter: (configLoader: ReturnType<typeof setup>, expressApp: Express) => Promise<void>;
|
@@ -1,9 +1,45 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
19
|
+
var ownKeys = function(o) {
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
+
var ar = [];
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
+
return ar;
|
24
|
+
};
|
25
|
+
return ownKeys(o);
|
26
|
+
};
|
27
|
+
return function (mod) {
|
28
|
+
if (mod && mod.__esModule) return mod;
|
29
|
+
var result = {};
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
+
__setModuleDefault(result, mod);
|
32
|
+
return result;
|
33
|
+
};
|
34
|
+
})();
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
36
|
+
exports.mountLoginRouter = void 0;
|
37
|
+
const passportPinejs = __importStar(require("./passport-pinejs"));
|
38
|
+
const pinejs_session_store_1 = require("../pinejs-session-store/pinejs-session-store");
|
39
|
+
const mountLoginRouter = async (configLoader, expressApp) => {
|
4
40
|
await Promise.all([
|
5
41
|
configLoader.loadConfig(passportPinejs.config),
|
6
|
-
configLoader.loadConfig(PinejsSessionStore.config),
|
42
|
+
configLoader.loadConfig(pinejs_session_store_1.PinejsSessionStore.config),
|
7
43
|
]);
|
8
44
|
if (typeof process === 'undefined' || !process?.env.DISABLE_DEFAULT_AUTH) {
|
9
45
|
expressApp.post('/login', passportPinejs.login((err, user, req, res) => {
|
@@ -33,4 +69,5 @@ export const mountLoginRouter = async (configLoader, expressApp) => {
|
|
33
69
|
});
|
34
70
|
}
|
35
71
|
};
|
72
|
+
exports.mountLoginRouter = mountLoginRouter;
|
36
73
|
//# sourceMappingURL=mount-login-router.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mount-login-router.js","sourceRoot":"","sources":["../../src/passport-pinejs/mount-login-router.ts"],"names":[],"mappings":"AAAA,
|
1
|
+
{"version":3,"file":"mount-login-router.js","sourceRoot":"","sources":["../../src/passport-pinejs/mount-login-router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kEAAoD;AAEpD,uFAAkF;AAG3E,MAAM,gBAAgB,GAAG,KAAK,EACpC,YAAsC,EACtC,UAAmB,EAClB,EAAE;IACH,MAAM,OAAO,CAAC,GAAG,CAAC;QACjB,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC;QAC9C,YAAY,CAAC,UAAU,CAAC,yCAAkB,CAAC,MAAM,CAAC;KAClD,CAAC,CAAC;IAEH,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAC1E,UAAU,CAAC,IAAI,CACd,QAAQ,EACR,cAAc,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5C,IAAI,GAAG,EAAE,CAAC;gBACT,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;gBACvC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACvB,CAAC;iBAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBAC3B,IAAI,GAAG,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;oBACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACP,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC7B,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,GAAG,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;oBACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACP,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CACF,CAAC;QAEF,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC9D,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC;AApCW,QAAA,gBAAgB,oBAoC3B"}
|
@@ -1,6 +1,6 @@
|
|
1
|
-
import type Express from 'express';
|
2
|
-
import type PassportLocal from 'passport-local';
|
3
|
-
import type * as ConfigLoader from '../config-loader/config-loader
|
1
|
+
import type * as Express from 'express';
|
2
|
+
import type * as PassportLocal from 'passport-local';
|
3
|
+
import type * as ConfigLoader from '../config-loader/config-loader';
|
4
4
|
export declare let login: (fn: (err: any, user: object | null | false | undefined, req: Express.Request, res: Express.Response, next: Express.NextFunction) => void) => Express.RequestHandler;
|
5
5
|
export declare let logout: Express.RequestHandler;
|
6
6
|
export declare const checkPassword: PassportLocal.VerifyFunction;
|
@@ -1,7 +1,41 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
19
|
+
var ownKeys = function(o) {
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
+
var ar = [];
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
+
return ar;
|
24
|
+
};
|
25
|
+
return ownKeys(o);
|
26
|
+
};
|
27
|
+
return function (mod) {
|
28
|
+
if (mod && mod.__esModule) return mod;
|
29
|
+
var result = {};
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
+
__setModuleDefault(result, mod);
|
32
|
+
return result;
|
33
|
+
};
|
34
|
+
})();
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
36
|
+
exports.config = exports.checkPassword = exports.logout = exports.login = void 0;
|
37
|
+
const permissions = __importStar(require("../sbvr-api/permissions"));
|
38
|
+
const checkPassword = async (username, password, done) => {
|
5
39
|
try {
|
6
40
|
const result = await permissions.checkPassword(username, password);
|
7
41
|
done(undefined, result);
|
@@ -10,6 +44,7 @@ export const checkPassword = async (username, password, done) => {
|
|
10
44
|
done(undefined, false);
|
11
45
|
}
|
12
46
|
};
|
47
|
+
exports.checkPassword = checkPassword;
|
13
48
|
const setup = async (app) => {
|
14
49
|
if (!process.browser) {
|
15
50
|
const { default: passport } = await import('passport');
|
@@ -22,8 +57,8 @@ const setup = async (app) => {
|
|
22
57
|
passport.deserializeUser((user, done) => {
|
23
58
|
done(null, user);
|
24
59
|
});
|
25
|
-
passport.use(new LocalStrategy(checkPassword));
|
26
|
-
login = (fn) => (req, res, next) => passport.authenticate('local', ((err, user) => {
|
60
|
+
passport.use(new LocalStrategy(exports.checkPassword));
|
61
|
+
exports.login = (fn) => (req, res, next) => passport.authenticate('local', ((err, user) => {
|
27
62
|
if (err || user == null || user === false) {
|
28
63
|
fn(err, user, req, res, next);
|
29
64
|
return;
|
@@ -32,7 +67,7 @@ const setup = async (app) => {
|
|
32
67
|
fn(error, user, req, res, next);
|
33
68
|
});
|
34
69
|
}))(req, res, next);
|
35
|
-
logout = (req, _res, next) => {
|
70
|
+
exports.logout = (req, _res, next) => {
|
36
71
|
req.logout((error) => {
|
37
72
|
if (error) {
|
38
73
|
next(error);
|
@@ -51,8 +86,8 @@ const setup = async (app) => {
|
|
51
86
|
}
|
52
87
|
next();
|
53
88
|
});
|
54
|
-
login = (fn) => (req, res, next) => {
|
55
|
-
checkPassword(req.body.username, req.body.password, (err, user) => {
|
89
|
+
exports.login = (fn) => (req, res, next) => {
|
90
|
+
(0, exports.checkPassword)(req.body.username, req.body.password, (err, user) => {
|
56
91
|
if (user) {
|
57
92
|
loggedIn = true;
|
58
93
|
loggedInUser = user;
|
@@ -60,7 +95,7 @@ const setup = async (app) => {
|
|
60
95
|
fn(err, user, req, res, next);
|
61
96
|
});
|
62
97
|
};
|
63
|
-
logout = (req, _res, next) => {
|
98
|
+
exports.logout = (req, _res, next) => {
|
64
99
|
delete req.user;
|
65
100
|
loggedIn = false;
|
66
101
|
loggedInUser = null;
|
@@ -68,7 +103,7 @@ const setup = async (app) => {
|
|
68
103
|
};
|
69
104
|
}
|
70
105
|
};
|
71
|
-
|
106
|
+
exports.config = {
|
72
107
|
models: [
|
73
108
|
{
|
74
109
|
customServerCode: { setup },
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":"AAMA,
|
1
|
+
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,43 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
19
|
+
var ownKeys = function(o) {
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
+
var ar = [];
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
+
return ar;
|
24
|
+
};
|
25
|
+
return ownKeys(o);
|
26
|
+
};
|
27
|
+
return function (mod) {
|
28
|
+
if (mod && mod.__esModule) return mod;
|
29
|
+
var result = {};
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
+
__setModuleDefault(result, mod);
|
32
|
+
return result;
|
33
|
+
};
|
34
|
+
})();
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
36
|
+
exports.PinejsSessionStore = exports.Store = void 0;
|
37
|
+
const express_session_1 = require("express-session");
|
38
|
+
Object.defineProperty(exports, "Store", { enumerable: true, get: function () { return express_session_1.Store; } });
|
39
|
+
const permissions = __importStar(require("../sbvr-api/permissions"));
|
40
|
+
const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
|
5
41
|
const sessionModel = `
|
6
42
|
Vocabulary: session
|
7
43
|
|
@@ -39,9 +75,9 @@ const asCallback = async (callback, promise) => {
|
|
39
75
|
catch {
|
40
76
|
}
|
41
77
|
};
|
42
|
-
|
78
|
+
class PinejsSessionStore extends express_session_1.Store {
|
43
79
|
get = ((sid, callback) => {
|
44
|
-
void asCallback(callback, api.session
|
80
|
+
void asCallback(callback, sbvr_utils_1.api.session
|
45
81
|
.get({
|
46
82
|
resource: 'session',
|
47
83
|
id: sid,
|
@@ -64,7 +100,7 @@ export class PinejsSessionStore extends Store {
|
|
64
100
|
data,
|
65
101
|
expiry_time: data?.cookie?.expires ?? null,
|
66
102
|
};
|
67
|
-
void asCallback(callback, api.session.put({
|
103
|
+
void asCallback(callback, sbvr_utils_1.api.session.put({
|
68
104
|
resource: 'session',
|
69
105
|
id: sid,
|
70
106
|
passthrough: {
|
@@ -74,7 +110,7 @@ export class PinejsSessionStore extends Store {
|
|
74
110
|
}));
|
75
111
|
});
|
76
112
|
destroy = ((sid, callback) => {
|
77
|
-
void asCallback(callback, api.session.delete({
|
113
|
+
void asCallback(callback, sbvr_utils_1.api.session.delete({
|
78
114
|
resource: 'session',
|
79
115
|
id: sid,
|
80
116
|
passthrough: {
|
@@ -83,7 +119,7 @@ export class PinejsSessionStore extends Store {
|
|
83
119
|
}));
|
84
120
|
});
|
85
121
|
all = ((callback) => {
|
86
|
-
void asCallback(callback, api.session
|
122
|
+
void asCallback(callback, sbvr_utils_1.api.session
|
87
123
|
.get({
|
88
124
|
resource: 'session',
|
89
125
|
passthrough: {
|
@@ -99,7 +135,7 @@ export class PinejsSessionStore extends Store {
|
|
99
135
|
.then((sessions) => sessions.map((s) => s.session_id)));
|
100
136
|
});
|
101
137
|
clear = ((callback) => {
|
102
|
-
void asCallback(callback, api.session.delete({
|
138
|
+
void asCallback(callback, sbvr_utils_1.api.session.delete({
|
103
139
|
resource: 'session',
|
104
140
|
passthrough: {
|
105
141
|
req: permissions.root,
|
@@ -107,7 +143,7 @@ export class PinejsSessionStore extends Store {
|
|
107
143
|
}));
|
108
144
|
});
|
109
145
|
length = ((callback) => {
|
110
|
-
void asCallback(callback, api.session.get({
|
146
|
+
void asCallback(callback, sbvr_utils_1.api.session.get({
|
111
147
|
resource: 'session/',
|
112
148
|
passthrough: {
|
113
149
|
req: permissions.rootRead,
|
@@ -157,4 +193,5 @@ export class PinejsSessionStore extends Store {
|
|
157
193
|
],
|
158
194
|
};
|
159
195
|
}
|
196
|
+
exports.PinejsSessionStore = PinejsSessionStore;
|
160
197
|
//# sourceMappingURL=pinejs-session-store.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"AAGA,
|
1
|
+
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import AbstractSQLCompiler from '@balena/abstract-sql-compiler';
|
1
|
+
import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
|
2
2
|
import { type ODataBinds } from '@balena/odata-to-abstract-sql';
|
3
|
-
import * as sbvrUtils from './sbvr-utils
|
4
|
-
import type { ODataRequest } from './uri-parser
|
3
|
+
import * as sbvrUtils from './sbvr-utils';
|
4
|
+
import type { ODataRequest } from './uri-parser';
|
5
5
|
export declare const compileRequest: (request: ODataRequest) => sbvrUtils.ODataRequest;
|
6
6
|
export declare const resolveOdataBind: (odataBinds: ODataBinds, value: any) => any;
|
7
7
|
export declare const getAndCheckBindValues: (request: Required<Pick<ODataRequest, "vocabulary" | "odataBinds" | "values" | "engine">>, bindings: AbstractSQLCompiler.Binding[]) => Promise<any[]>;
|
@@ -1,12 +1,51 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
1
|
+
"use strict";
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
3
|
+
if (k2 === undefined) k2 = k;
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
+
}
|
8
|
+
Object.defineProperty(o, k2, desc);
|
9
|
+
}) : (function(o, m, k, k2) {
|
10
|
+
if (k2 === undefined) k2 = k;
|
11
|
+
o[k2] = m[k];
|
12
|
+
}));
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
+
}) : function(o, v) {
|
16
|
+
o["default"] = v;
|
17
|
+
});
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
19
|
+
var ownKeys = function(o) {
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
+
var ar = [];
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
+
return ar;
|
24
|
+
};
|
25
|
+
return ownKeys(o);
|
26
|
+
};
|
27
|
+
return function (mod) {
|
28
|
+
if (mod && mod.__esModule) return mod;
|
29
|
+
var result = {};
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
+
__setModuleDefault(result, mod);
|
32
|
+
return result;
|
33
|
+
};
|
34
|
+
})();
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
37
|
+
};
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
39
|
+
exports.isRuleAffected = exports.getAndCheckBindValues = exports.resolveOdataBind = exports.compileRequest = void 0;
|
40
|
+
const lodash_1 = __importDefault(require("lodash"));
|
41
|
+
const AbstractSQLCompiler = __importStar(require("@balena/abstract-sql-compiler"));
|
42
|
+
const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
|
43
|
+
const deepFreeze = require("deep-freeze");
|
44
|
+
const memoizee_1 = __importDefault(require("memoizee"));
|
45
|
+
const env = __importStar(require("../config-loader/env"));
|
46
|
+
const errors_1 = require("./errors");
|
47
|
+
const sbvrUtils = __importStar(require("./sbvr-utils"));
|
48
|
+
const getMemoizedCompileRule = (0, memoizee_1.default)((engine) => env.createCache('abstractSqlCompiler', (abstractSqlQuery) => {
|
10
49
|
const sqlQuery = AbstractSQLCompiler[engine].compileRule(abstractSqlQuery);
|
11
50
|
const modifiedFields = AbstractSQLCompiler[engine].getModifiedFields(abstractSqlQuery);
|
12
51
|
if (modifiedFields != null) {
|
@@ -17,11 +56,11 @@ const getMemoizedCompileRule = memoize((engine) => env.createCache('abstractSqlC
|
|
17
56
|
modifiedFields,
|
18
57
|
};
|
19
58
|
}, { weak: true }), { primitive: true });
|
20
|
-
|
59
|
+
const compileRequest = (request) => {
|
21
60
|
if (request.abstractSqlQuery != null) {
|
22
61
|
const { engine } = request;
|
23
62
|
if (engine == null) {
|
24
|
-
throw new SqlCompilationError('No database engine specified');
|
63
|
+
throw new errors_1.SqlCompilationError('No database engine specified');
|
25
64
|
}
|
26
65
|
try {
|
27
66
|
const { sqlQuery, modifiedFields } = getMemoizedCompileRule(engine)(request.abstractSqlQuery);
|
@@ -30,18 +69,20 @@ export const compileRequest = (request) => {
|
|
30
69
|
}
|
31
70
|
catch (err) {
|
32
71
|
sbvrUtils.logger[request.vocabulary].error('Failed to compile abstract sql: ', request.abstractSqlQuery, err);
|
33
|
-
throw new SqlCompilationError(err);
|
72
|
+
throw new errors_1.SqlCompilationError(err);
|
34
73
|
}
|
35
74
|
}
|
36
75
|
return request;
|
37
76
|
};
|
38
|
-
|
39
|
-
|
77
|
+
exports.compileRequest = compileRequest;
|
78
|
+
const resolveOdataBind = (odataBinds, value) => {
|
79
|
+
if (value != null && typeof value === 'object' && (0, odata_to_abstract_sql_1.isBindReference)(value)) {
|
40
80
|
[, value] = odataBinds[value.bind];
|
41
81
|
}
|
42
82
|
return value;
|
43
83
|
};
|
44
|
-
|
84
|
+
exports.resolveOdataBind = resolveOdataBind;
|
85
|
+
const getAndCheckBindValues = async (request, bindings) => {
|
45
86
|
const { odataBinds, values, engine } = request;
|
46
87
|
const sqlModelTables = sbvrUtils.getAbstractSqlModel(request).tables;
|
47
88
|
return await Promise.all(bindings.map(async (binding) => {
|
@@ -58,9 +99,9 @@ export const getAndCheckBindValues = async (request, bindings) => {
|
|
58
99
|
if (value === undefined) {
|
59
100
|
value = values[fieldName];
|
60
101
|
}
|
61
|
-
value = resolveOdataBind(odataBinds, value);
|
62
|
-
const sqlTableName = odataNameToSqlName(tableName);
|
63
|
-
const sqlFieldName = odataNameToSqlName(fieldName);
|
102
|
+
value = (0, exports.resolveOdataBind)(odataBinds, value);
|
103
|
+
const sqlTableName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(tableName);
|
104
|
+
const sqlFieldName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(fieldName);
|
64
105
|
const table = sqlModelTables[sqlTableName];
|
65
106
|
const maybeField = (table.modifyFields ?? table.fields).find((f) => f.fieldName === sqlFieldName);
|
66
107
|
if (maybeField == null) {
|
@@ -102,10 +143,11 @@ export const getAndCheckBindValues = async (request, bindings) => {
|
|
102
143
|
return await AbstractSQLCompiler[engine].dataTypeValidate(value, field);
|
103
144
|
}
|
104
145
|
catch (err) {
|
105
|
-
throw new BadRequestError(`"${fieldName}" ${err.message}`);
|
146
|
+
throw new errors_1.BadRequestError(`"${fieldName}" ${err.message}`);
|
106
147
|
}
|
107
148
|
}));
|
108
149
|
};
|
150
|
+
exports.getAndCheckBindValues = getAndCheckBindValues;
|
109
151
|
const checkModifiedFields = (ruleReferencedFields, modifiedFields) => {
|
110
152
|
const refs = ruleReferencedFields[modifiedFields.table];
|
111
153
|
if (refs == null) {
|
@@ -117,10 +159,10 @@ const checkModifiedFields = (ruleReferencedFields, modifiedFields) => {
|
|
117
159
|
if (modifiedFields.fields == null) {
|
118
160
|
return true;
|
119
161
|
}
|
120
|
-
return (
|
162
|
+
return (lodash_1.default.intersection(refs[modifiedFields.action], modifiedFields.fields).length >
|
121
163
|
0);
|
122
164
|
};
|
123
|
-
|
165
|
+
const isRuleAffected = (rule, request) => {
|
124
166
|
if (request?.abstractSqlQuery == null) {
|
125
167
|
return false;
|
126
168
|
}
|
@@ -133,8 +175,9 @@ export const isRuleAffected = (rule, request) => {
|
|
133
175
|
return true;
|
134
176
|
}
|
135
177
|
if (Array.isArray(modifiedFields)) {
|
136
|
-
return modifiedFields.some(
|
178
|
+
return modifiedFields.some(lodash_1.default.partial(checkModifiedFields, rule.ruleReferencedFields));
|
137
179
|
}
|
138
180
|
return checkModifiedFields(rule.ruleReferencedFields, modifiedFields);
|
139
181
|
};
|
182
|
+
exports.isRuleAffected = isRuleAffected;
|
140
183
|
//# sourceMappingURL=abstract-sql.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abstract-sql.js","sourceRoot":"","sources":["../../src/sbvr-api/abstract-sql.ts"],"names":[],"mappings":"AAAA,
|
1
|
+
{"version":3,"file":"abstract-sql.js","sourceRoot":"","sources":["../../src/sbvr-api/abstract-sql.ts"],"names":[],"mappings":"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"}
|
@@ -1,14 +1,20 @@
|
|
1
|
-
|
1
|
+
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
+
exports.cachedCompile = void 0;
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
2
8
|
const cacheFile = process.env.PINEJS_CACHE_FILE || '.pinejs-cache.json';
|
3
9
|
let cache = null;
|
4
10
|
let fs;
|
5
11
|
try {
|
6
|
-
fs =
|
12
|
+
fs = require('fs');
|
7
13
|
}
|
8
14
|
catch {
|
9
15
|
}
|
10
16
|
const SAVE_DEBOUNCE_TIME = 5000;
|
11
|
-
const saveCache =
|
17
|
+
const saveCache = lodash_1.default.debounce(() => {
|
12
18
|
if (fs != null) {
|
13
19
|
fs.writeFile(cacheFile, JSON.stringify(cache), 'utf8', (err) => {
|
14
20
|
if (err) {
|
@@ -17,10 +23,10 @@ const saveCache = _.debounce(() => {
|
|
17
23
|
});
|
18
24
|
}
|
19
25
|
}, SAVE_DEBOUNCE_TIME);
|
20
|
-
const clearCache =
|
26
|
+
const clearCache = lodash_1.default.debounce(() => {
|
21
27
|
cache = null;
|
22
28
|
}, SAVE_DEBOUNCE_TIME * 2);
|
23
|
-
|
29
|
+
const cachedCompile = (name, version, src, fn) => {
|
24
30
|
if (cache == null) {
|
25
31
|
if (fs != null) {
|
26
32
|
try {
|
@@ -32,13 +38,14 @@ export const cachedCompile = (name, version, src, fn) => {
|
|
32
38
|
cache ??= {};
|
33
39
|
}
|
34
40
|
const key = [name, version, JSON.stringify(src)];
|
35
|
-
let result =
|
41
|
+
let result = lodash_1.default.get(cache, key);
|
36
42
|
if (result == null) {
|
37
43
|
result = fn();
|
38
|
-
|
44
|
+
lodash_1.default.set(cache, key, result);
|
39
45
|
saveCache();
|
40
46
|
}
|
41
47
|
clearCache();
|
42
|
-
return
|
48
|
+
return lodash_1.default.cloneDeep(result);
|
43
49
|
};
|
50
|
+
exports.cachedCompile = cachedCompile;
|
44
51
|
//# sourceMappingURL=cached-compile.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":"AAEA,
|
1
|
+
{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":";;;;;;AAEA,oDAAuB;AAEvB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;AACxE,IAAI,KAAK,GAML,IAAI,CAAC;AACT,IAAI,EAAyB,CAAC;AAC9B,IAAI,CAAC;IACJ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC;AAAC,MAAM,CAAC;AAET,CAAC;AAED,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,SAAS,GAAG,gBAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IACjC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QAChB,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAI,GAAG,EAAE,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEvB,MAAM,UAAU,GAAG,gBAAC,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,CAAC;QACnB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC;gBACJ,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;YACxD,CAAC;YAAC,MAAM,CAAC;YAET,CAAC;QACF,CAAC;QACD,KAAK,KAAK,EAAE,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,IAAI,MAAM,GAAG,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,GAAG,EAAE,EAAE,CAAC;QACd,gBAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC;IACb,CAAC;IAKD,UAAU,EAAE,CAAC;IACb,OAAO,gBAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC,CAAC;AA7BW,QAAA,aAAa,iBA6BxB"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import type { Resolvable } from './common-types
|
1
|
+
import type { Resolvable } from './common-types';
|
2
2
|
import { TypedError } from 'typed-error';
|
3
3
|
export type MappingFunction = <T, U>(a: T[], fn: (v: T) => Resolvable<U>) => Promise<Array<U | Error>>;
|
4
4
|
export declare const mapSeries: <T, U>(a: T[], fn: (v: T) => Resolvable<U>) => Promise<U[]>;
|