@balena/pinejs 16.0.0-build--batch-f2ffc3d6bcb9f3294fd4fc9de3c21bfe167e100d-1 → 16.0.0-build-fisehara-update-sbvr-types-b58e72aca3193964afac96c955fde178fe39d077-1

package/out/webresource-handler/index.js

@@ -0,0 +1,307 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupUploadHooks = exports.getDefaultHandler = exports.normalizeHref = exports.getUploaderMiddlware = exports.getWebresourceHandler = exports.setupWebresourceHandler = exports.FileSizeExceededError = exports.WebResourceError = void 0;
+const busboy_1 = __importDefault(require("busboy"));
+const uriParser = __importStar(require("../sbvr-api/uri-parser"));
+const sbvrUtils = __importStar(require("../sbvr-api/sbvr-utils"));
+const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
+const permissions_1 = require("../sbvr-api/permissions");
+const NoopHandler_1 = require("./handlers/NoopHandler");
+const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
+const module_1 = require("../server-glue/module");
+const typed_error_1 = require("typed-error");
+__exportStar(require("./handlers"), exports);
+class WebResourceError extends typed_error_1.TypedError {
+}
+exports.WebResourceError = WebResourceError;
+class FileSizeExceededError extends WebResourceError {
+    constructor(maxSize) {
+        super(`File size exceeded the limit of ${maxSize} bytes.`);
+        this.name = 'FileSizeExceededError';
+    }
+}
+exports.FileSizeExceededError = FileSizeExceededError;
+const getLogger = (vocab) => {
+    if (vocab) {
+        return sbvrUtils.api[vocab]?.logger ?? console;
+    }
+    return console;
+};
+let configuredWebResourceHandler;
+const setupWebresourceHandler = (handler) => {
+    configuredWebResourceHandler = handler;
+};
+exports.setupWebresourceHandler = setupWebresourceHandler;
+const getWebresourceHandler = () => {
+    return configuredWebResourceHandler;
+};
+exports.getWebresourceHandler = getWebresourceHandler;
+const isFileInValidPath = async (fieldname, req) => {
+    if (req.method !== 'POST' && req.method !== 'PATCH') {
+        return false;
+    }
+    const apiRoot = (0, sbvr_utils_1.getApiRoot)(req);
+    if (apiRoot == null) {
+        return false;
+    }
+    const model = (0, sbvr_utils_1.getModel)(apiRoot);
+    const odataRequest = uriParser.parseOData({
+        url: req.url,
+        method: req.method,
+    });
+    const sqlResourceName = sbvrUtils.resolveSynonym(odataRequest);
+    const table = model.abstractSql.tables[sqlResourceName];
+    if (table == null) {
+        return false;
+    }
+    const permission = req.method === 'POST' ? 'create' : 'update';
+    const vocab = model.versions[model.versions.length - 1];
+    const hasPermissions = await (0, permissions_1.checkPermissions)(req, permission, odataRequest.resourceName, vocab);
+    if (!hasPermissions) {
+        return false;
+    }
+    const dbFieldName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(fieldname);
+    return table.fields.some((field) => field.fieldName === dbFieldName && field.dataType === 'WebResource');
+};
+const getUploaderMiddlware = (handler) => {
+    return async (req, res, next) => {
+        if (!req.is('multipart')) {
+            return next();
+        }
+        const uploadedFilePaths = [];
+        const completeUploads = [];
+        const bb = (0, busboy_1.default)({ headers: req.headers });
+        let isAborting = false;
+        const finishFileUpload = () => {
+            req.unpipe(bb);
+            req.on('readable', req.read.bind(req));
+            bb.removeAllListeners();
+        };
+        const clearFiles = async () => {
+            isAborting = true;
+            const deletions = uploadedFilePaths.map((file) => handler.removeFile(file));
+            try {
+                return await Promise.all(deletions);
+            }
+            catch (err) {
+                getLogger((0, sbvr_utils_1.getApiRoot)(req)).error('Error deleting file', err);
+            }
+        };
+        bb.on('file', (fieldname, filestream, info) => {
+            if (isAborting) {
+                filestream.resume();
+                return;
+            }
+            completeUploads.push((async () => {
+                try {
+                    if (!(await isFileInValidPath(fieldname, req))) {
+                        filestream.resume();
+                        return;
+                    }
+                    const file = {
+                        originalname: info.filename,
+                        encoding: info.encoding,
+                        mimetype: info.mimeType,
+                        stream: filestream,
+                        fieldname,
+                    };
+                    const result = await handler.handleFile(file);
+                    req.body[fieldname] = {
+                        filename: info.filename,
+                        content_type: info.mimeType,
+                        content_disposition: undefined,
+                        size: result.size,
+                        href: result.filename,
+                    };
+                    uploadedFilePaths.push(result.filename);
+                }
+                catch (err) {
+                    filestream.resume();
+                    throw err;
+                }
+            })());
+        });
+        bb.on('field', (name, val) => {
+            req.body[name] = val;
+        });
+        bb.on('finish', async () => {
+            try {
+                await Promise.all(completeUploads);
+                finishFileUpload();
+                next();
+            }
+            catch (err) {
+                await clearFiles();
+                if (err instanceof FileSizeExceededError) {
+                    return sbvrUtils.handleHttpErrors(req, res, new module_1.errors.BadRequestError(err.message));
+                }
+                getLogger((0, sbvr_utils_1.getApiRoot)(req)).error('Error uploading file', err);
+                next(err);
+            }
+        });
+        bb.on('error', async (err) => {
+            await clearFiles();
+            finishFileUpload();
+            next(err);
+        });
+        req.pipe(bb);
+    };
+};
+exports.getUploaderMiddlware = getUploaderMiddlware;
+const getWebResourceFields = (request, useTranslations = true) => {
+    const resourceName = sbvrUtils.resolveSynonym(request);
+    const sqlResourceName = (0, odata_to_abstract_sql_1.odataNameToSqlName)(resourceName);
+    const model = sbvrUtils.getAbstractSqlModel(request).tables[sqlResourceName];
+    const fields = useTranslations
+        ? model.modifyFields ?? model.fields
+        : model.fields;
+    return fields
+        .filter((f) => f.dataType === 'WebResource')
+        .map((f) => (0, odata_to_abstract_sql_1.sqlNameToODataName)(f.fieldName));
+};
+const deleteFiles = async (keysToDelete, webResourceHandler) => {
+    const promises = keysToDelete.map((r) => webResourceHandler.removeFile(r));
+    await Promise.all(promises);
+};
+const throwIfWebresourceNotInMultipart = (webResourceFields, { req, request }) => {
+    if (!req.is?.('multipart') &&
+        webResourceFields.some((field) => request.values[field] != null)) {
+        throw new module_1.errors.BadRequestError('Use multipart requests to upload a file.');
+    }
+};
+const getCreateWebResourceHooks = (webResourceHandler) => {
+    return {
+        PRERUN: (hookArgs) => {
+            const webResourceFields = getWebResourceFields(hookArgs.request);
+            throwIfWebresourceNotInMultipart(webResourceFields, hookArgs);
+        },
+        'POSTRUN-ERROR': async ({ tx, request }) => {
+            tx.on('rollback', () => {
+                void deleteRollbackPendingFields(request, webResourceHandler);
+            });
+        },
+    };
+};
+const isDefined = (x) => x != null;
+const getWebResourcesHrefs = (webResources) => {
+    const hrefs = (webResources ?? []).flatMap((resource) => Object.values(resource ?? {})
+        .filter(isDefined)
+        .map((resourceKey) => (0, exports.normalizeHref)(resourceKey.href)));
+    return hrefs;
+};
+const normalizeHref = (href) => {
+    return href.split('?')[0];
+};
+exports.normalizeHref = normalizeHref;
+const getWebResourcesKeysFromRequest = (webResourceFields, { values }) => {
+    return webResourceFields
+        .map((field) => values[field]?.href)
+        .filter(isDefined);
+};
+const getRemoveWebResourceHooks = (webResourceHandler) => {
+    return {
+        PRERUN: async (args) => {
+            const { api, request, tx } = args;
+            let webResourceFields = getWebResourceFields(request);
+            throwIfWebresourceNotInMultipart(webResourceFields, args);
+            tx.on('rollback', () => {
+                void deleteRollbackPendingFields(request, webResourceHandler);
+            });
+            if (request.method === 'PATCH') {
+                webResourceFields = Object.entries(request.values)
+                    .filter(([key, value]) => value !== undefined && webResourceFields.includes(key))
+                    .map(([key]) => key);
+            }
+            if (webResourceFields.length === 0) {
+                return;
+            }
+            if (request.method === 'PATCH' && request.odataQuery?.key == null) {
+                const keysToDelete = getWebResourcesKeysFromRequest(webResourceFields, request);
+                tx.on('end', () => {
+                    deletePendingFiles(keysToDelete, request, webResourceHandler);
+                });
+                throw new module_1.errors.BadRequestError('WebResources can only be updated when providing a resource key.');
+            }
+            const ids = await sbvrUtils.getAffectedIds(args);
+            if (ids.length === 0) {
+                const keysToDelete = getWebResourcesKeysFromRequest(webResourceFields, request);
+                deletePendingFiles(keysToDelete, request, webResourceHandler);
+                return;
+            }
+            const webResources = (await api.get({
+                resource: request.resourceName,
+                passthrough: {
+                    tx: args.tx,
+                    req: module_1.permissions.root,
+                },
+                options: {
+                    $select: webResourceFields,
+                    $filter: {
+                        id: {
+                            $in: ids,
+                        },
+                    },
+                },
+            }));
+            tx.on('end', () => {
+                deletePendingFiles(getWebResourcesHrefs(webResources), request, webResourceHandler);
+            });
+        },
+    };
+};
+const deleteRollbackPendingFields = async (request, webResourceHandler) => {
+    const fields = getWebResourceFields(request);
+    if (fields.length === 0) {
+        return;
+    }
+    const keysToDelete = getWebResourcesKeysFromRequest(fields, request);
+    await deleteFiles(keysToDelete, webResourceHandler);
+};
+const deletePendingFiles = (keysToDelete, request, webResourceHandler) => {
+    try {
+        void deleteFiles(keysToDelete, webResourceHandler);
+    }
+    catch (err) {
+        getLogger(request.vocabulary).error(`Failed to delete pending files`, err);
+    }
+};
+const getDefaultHandler = () => {
+    return new NoopHandler_1.NoopHandler();
+};
+exports.getDefaultHandler = getDefaultHandler;
+const setupUploadHooks = (handler, apiRoot, resourceName) => {
+    sbvrUtils.addPureHook('DELETE', apiRoot, resourceName, getRemoveWebResourceHooks(handler));
+    sbvrUtils.addPureHook('PATCH', apiRoot, resourceName, getRemoveWebResourceHooks(handler));
+    sbvrUtils.addPureHook('POST', apiRoot, resourceName, getCreateWebResourceHooks(handler));
+};
+exports.setupUploadHooks = setupUploadHooks;
+//# sourceMappingURL=index.js.map

package/out/webresource-handler/index.js.map

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

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@balena/pinejs",
-  "version": "16.0.0-build--batch-f2ffc3d6bcb9f3294fd4fc9de3c21bfe167e100d-1",
+  "version": "16.0.0-build-fisehara-update-sbvr-types-b58e72aca3193964afac96c955fde178fe39d077-1",
   "main": "out/server-glue/module",
+  "type": "commonjs",
   "repository": "git@github.com:balena-io/pinejs.git",
   "license": "Apache-2.0",
   "bin": {
@@ -17,62 +18,65 @@
     "webpack-module": "grunt module",
     "webpack-server": "grunt server",
     "webpack-build": "npm run webpack-browser && npm run webpack-module && npm run webpack-server",
-    "lint": "balena-lint -e js -e ts src build typings Gruntfile.ts && npx tsc --project tsconfig.dev.json --noEmit",
+    "lint": "balena-lint -t tsconfig.dev.json -e js -e ts src build typings Gruntfile.ts && npx tsc --project tsconfig.dev.json --noEmit",
     "test": "npm run lint && npm run build && npm run webpack-build && npm run test:compose",
-    "test:compose": "trap 'docker-compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' SIGINT; docker-compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres npm run mocha",
+    "test:compose": "trap 'docker-compose -f docker-compose.npm-test.yml down ; echo Stopped ; exit 0' SIGINT; docker-compose -f docker-compose.npm-test.yml up -d && sleep 2 && DATABASE_URL=postgres://docker:docker@localhost:5431/postgres PINEJS_WEBRESOURCE_MAXFILESIZE=1000000000 S3_ENDPOINT=http://localhost:43680 S3_ACCESS_KEY=USERNAME S3_SECRET_KEY=PASSWORD S3_STORAGE_ADAPTER_BUCKET=balena-pine-web-resources S3_REGION=us-east-1 npm run mocha",
     "mocha": "TS_NODE_FILES=true mocha",
-    "prettify": "balena-lint -e js -e ts --fix src build typings Gruntfile.ts"
+    "prettify": "balena-lint -t tsconfig.dev.json -e js -e ts --fix src test build typings Gruntfile.ts"
   },
   "dependencies": {
-    "@balena/abstract-sql-compiler": "^9.0.2",
-    "@balena/abstract-sql-to-typescript": "^2.0.0",
-    "@balena/env-parsing": "^1.1.5",
-    "@balena/lf-to-abstract-sql": "^5.0.0",
-    "@balena/odata-parser": "^3.0.0",
-    "@balena/odata-to-abstract-sql": "^6.0.1",
+    "@balena/abstract-sql-compiler": "^9.0.4",
+    "@balena/abstract-sql-to-typescript": "^2.1.3",
+    "@balena/env-parsing": "^1.1.10",
+    "@balena/lf-to-abstract-sql": "^5.0.1",
+    "@balena/odata-parser": "^3.0.3",
+    "@balena/odata-to-abstract-sql": "^6.2.3",
     "@balena/sbvr-parser": "^1.4.3",
-    "@balena/sbvr-types": "^5.0.0",
-    "@types/body-parser": "^1.19.2",
-    "@types/compression": "^1.7.2",
-    "@types/cookie-parser": "^1.4.3",
-    "@types/deep-freeze": "^0.1.2",
-    "@types/express": "^4.17.17",
-    "@types/express-session": "^1.17.7",
-    "@types/lodash": "^4.14.194",
-    "@types/memoizee": "^0.4.8",
-    "@types/method-override": "^0.0.32",
-    "@types/multer": "^1.4.7",
-    "@types/mysql": "^2.15.21",
-    "@types/node": "^18.16.1",
-    "@types/passport": "^1.0.12",
-    "@types/passport-local": "^1.0.35",
-    "@types/passport-strategy": "^0.2.35",
-    "@types/pg": "^8.6.6",
-    "@types/randomstring": "^1.1.8",
-    "@types/websql": "^0.0.27",
-    "commander": "^10.0.1",
+    "@balena/sbvr-types": "^7.0.1",
+    "@types/body-parser": "^1.19.5",
+    "@types/compression": "^1.7.5",
+    "@types/cookie-parser": "^1.4.6",
+    "@types/deep-freeze": "^0.1.5",
+    "@types/express": "^4.17.21",
+    "@types/express-session": "^1.17.10",
+    "@types/lodash": "^4.14.202",
+    "@types/memoizee": "^0.4.11",
+    "@types/method-override": "^0.0.35",
+    "@types/multer": "^1.4.11",
+    "@types/mysql": "^2.15.25",
+    "@types/node": "^20.11.2",
+    "@types/passport": "^1.0.16",
+    "@types/passport-local": "^1.0.38",
+    "@types/passport-strategy": "^0.2.38",
+    "@types/pg": "^8.10.9",
+    "@types/randomstring": "^1.1.11",
+    "@types/websql": "^0.0.30",
+    "busboy": "^1.6.0",
+    "commander": "^11.1.0",
     "deep-freeze": "^0.0.1",
-    "eventemitter3": "^5.0.0",
+    "eventemitter3": "^5.0.1",
     "express-session": "^1.17.3",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
-    "pinejs-client-core": "^6.13.0",
-    "randomstring": "^1.2.3",
+    "pinejs-client-core": "^6.14.0",
+    "randomstring": "^1.3.0",
     "typed-error": "^3.2.2"
   },
   "devDependencies": {
-    "@balena/lint": "^6.2.2",
-    "@faker-js/faker": "^7.6.0",
-    "@types/chai": "^4.3.4",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/grunt": "^0.4.27",
-    "@types/mocha": "^10.0.1",
-    "@types/on-finished": "^2.3.1",
-    "@types/request": "^2.48.8",
-    "@types/supertest": "^2.0.12",
+    "@balena/lint": "^7.2.4",
+    "@faker-js/faker": "^8.3.1",
+    "@types/busboy": "^1.5.3",
+    "@types/chai": "^4.3.11",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/grunt": "^0.4.31",
+    "@types/mocha": "^10.0.6",
+    "@types/on-finished": "^2.3.4",
+    "@types/request": "^2.48.12",
+    "@types/supertest": "^6.0.2",
     "@types/terser-webpack-plugin": "^5.2.0",
-    "@types/webpack": "^5.28.1",
-    "chai": "^4.3.7",
+    "@types/type-is": "^1.6.6",
+    "@types/webpack": "^5.28.5",
+    "chai": "^4.4.1",
     "grunt": "^1.6.1",
     "grunt-check-dependencies": "^1.0.0",
     "grunt-cli": "^1.4.3",
@@ -83,37 +87,39 @@
     "grunt-gitinfo": "^0.1.9",
     "grunt-text-replace": "^0.4.0",
     "grunt-ts": "^6.0.0-beta.22",
-    "grunt-webpack": "^5.0.0",
+    "grunt-webpack": "^6.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "^13.2.2",
+    "lint-staged": "^15.2.0",
     "load-grunt-tasks": "^5.1.0",
     "mocha": "^10.2.0",
     "on-finished": "^2.4.1",
-    "pinejs-client-supertest": "^1.4.0",
+    "pinejs-client-supertest": "^2.0.2",
     "raw-loader": "^4.0.2",
     "request": "^2.88.2",
     "require-npm4-to-publish": "^1.0.0",
-    "supertest": "^6.3.3",
-    "terser-webpack-plugin": "^5.3.7",
-    "ts-loader": "^9.4.2",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.3",
-    "webpack": "^5.81.0",
-    "webpack-dev-server": "^4.13.3"
+    "supertest": "^6.3.4",
+    "terser-webpack-plugin": "^5.3.10",
+    "ts-loader": "^9.5.1",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3",
+    "webpack": "^5.89.0",
+    "webpack-dev-server": "^4.15.1"
   },
   "optionalDependencies": {
-    "bcrypt": "^5.1.0",
+    "@aws-sdk/client-s3": "^3.490.0",
+    "@aws-sdk/lib-storage": "^3.490.0",
+    "@aws-sdk/s3-request-presigner": "^3.490.0",
+    "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
     "method-override": "^3.0.0",
-    "multer": "1.4.5-lts.1",
     "mysql": "^2.18.1",
-    "passport": "^0.6.0",
+    "passport": "^0.7.0",
     "passport-local": "^1.0.0",
-    "pg": "^8.10.0",
-    "pg-connection-string": "^2.5.0",
+    "pg": "^8.11.3",
+    "pg-connection-string": "^2.6.2",
     "serve-static": "^1.15.0"
   },
   "engines": {
@@ -122,10 +128,10 @@
   },
   "lint-staged": {
     "*.js": [
-      "balena-lint --fix"
+      "balena-lint -t tsconfig.dev.json --fix"
     ],
     "*.ts": [
-      "balena-lint --fix"
+      "balena-lint -t tsconfig.dev.json --fix"
     ]
   },
   "mocha": {
@@ -138,6 +144,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2023-08-14T13:58:20.458Z"
+    "publishedAt": "2024-03-05T20:13:08.529Z"
   }
 }

package/src/bin/abstract-sql-compiler.ts

@@ -5,22 +5,20 @@ import {
 	writeSqlModel,
 } from './utils';
 
-import type * as SbvrUtils from '../sbvr-api/sbvr-utils';
-
 import { program } from 'commander';
 
-const runCompile = (inputFile: string, outputFile?: string) => {
-	const { generateSqlModel } =
-		require('../sbvr-api/sbvr-utils') as typeof SbvrUtils;
+const runCompile = async (inputFile: string, outputFile?: string) => {
+	const { generateSqlModel } = await import('../sbvr-api/sbvr-utils.js');
 	const abstractSql = getAbstractSqlModelFromFile(inputFile);
 	const sqlModel = generateSqlModel(abstractSql, program.opts().engine);
 
 	writeSqlModel(sqlModel, outputFile);
 };
 
-const generateTypes = (inputFile: string, outputFile?: string) => {
-	const { abstractSqlToTypescriptTypes } =
-		require('@balena/abstract-sql-to-typescript') as typeof import('@balena/abstract-sql-to-typescript');
+const generateTypes = async (inputFile: string, outputFile?: string) => {
+	const { abstractSqlToTypescriptTypes } = await import(
+		'@balena/abstract-sql-to-typescript'
+	);
 	const abstractSql = getAbstractSqlModelFromFile(inputFile);
 	const types = abstractSqlToTypescriptTypes(abstractSql);
 
@@ -62,4 +60,4 @@ if (process.argv.length === 2) {
 	program.help();
 }
 
-program.parse(process.argv);
+void program.parseAsync(process.argv);

package/src/bin/odata-compiler.ts

@@ -1,13 +1,12 @@
 import { getAbstractSqlModelFromFile, version, writeAll } from './utils';
-import type * as AbstractSql from '../sbvr-api/abstract-sql';
-import type * as UriParser from '../sbvr-api/uri-parser';
 import type { SqlResult } from '@balena/abstract-sql-compiler';
 
 import { program } from 'commander';
 
-const generateAbstractSqlQuery = (modelFile: string, odata: string) => {
-	const { memoizedParseOdata, translateUri } =
-		require('../sbvr-api/uri-parser') as typeof UriParser;
+const generateAbstractSqlQuery = async (modelFile: string, odata: string) => {
+	const { memoizedParseOdata, translateUri } = await import(
+		'../sbvr-api/uri-parser.js'
+	);
 	const odataAST = memoizedParseOdata(odata);
 	const vocabulary = '';
 	return translateUri({
@@ -26,20 +25,19 @@ const generateAbstractSqlQuery = (modelFile: string, odata: string) => {
 	});
 };
 
-const parseOData = (odata: string, outputFile?: string) => {
-	const { memoizedParseOdata } =
-		require('../sbvr-api/uri-parser') as typeof UriParser;
+const parseOData = async (odata: string, outputFile?: string) => {
+	const { memoizedParseOdata } = await import('../sbvr-api/uri-parser.js');
 	const result = memoizedParseOdata(odata);
 	const json = JSON.stringify(result, null, 2);
 	writeAll(json, outputFile);
 };
 
-const translateOData = (
+const translateOData = async (
 	modelFile: string,
 	odata: string,
 	outputFile?: string,
 ) => {
-	const request = generateAbstractSqlQuery(modelFile, odata);
+	const request = await generateAbstractSqlQuery(modelFile, odata);
 	const json = JSON.stringify(request.abstractSqlQuery, null, 2);
 	writeAll(json, outputFile);
 };
@@ -55,14 +53,13 @@ Bindings: ${JSON.stringify(sqlQuery.bindings, null, 2)}
 	}
 };
 
-const compileOData = (
+const compileOData = async (
 	modelFile: string,
 	odata: string,
 	outputFile?: string,
 ) => {
-	const translatedRequest = generateAbstractSqlQuery(modelFile, odata);
-	const { compileRequest } =
-		require('../sbvr-api/abstract-sql') as typeof AbstractSql;
+	const translatedRequest = await generateAbstractSqlQuery(modelFile, odata);
+	const { compileRequest } = await import('../sbvr-api/abstract-sql.js');
 	const compiledRequest = compileRequest(translatedRequest);
 	let output;
 	if (program.opts().json) {
@@ -109,4 +106,4 @@ if (process.argv.length === 2) {
 	program.help();
 }
 
-program.parse(process.argv);
+void program.parseAsync(process.argv);