@balena/pinejs 14.60.0-build-translated-models-85baf731130de328e2067a26c40b37309cdb1ac5-1 → 15.0.0-build-15-x-9f7b9bfe63741d7ae5f446e013251758d9d6ca26-1

package/out/sbvr-api/sbvr-utils.js

@@ -33,7 +33,6 @@ var abstract_sql_2 = require("./abstract-sql");
 Object.defineProperty(exports, "resolveOdataBind", { enumerable: true, get: function () { return abstract_sql_2.resolveOdataBind; } });
 const odataResponse = require("./odata-response");
 const module_1 = require("../server-glue/module");
-const translations_1 = require("./translations");
 const LF2AbstractSQLTranslator = LF2AbstractSQL.createTranslator(sbvrTypes);
 const LF2AbstractSQLTranslatorVersion = `${package_json_2.version}+${package_json_3.version}`;
 const models = {};
@@ -86,7 +85,7 @@ const prettifyConstraintError = (err, request) => {
                     break;
                 case 'postgres':
                     const resourceName = (0, exports.resolveSynonym)(request);
-                    const abstractSqlModel = getFinalAbstractSqlModel(request);
+                    const abstractSqlModel = (0, exports.getAbstractSqlModel)(request);
                     matches = new RegExp('"' + abstractSqlModel.tables[resourceName].name + '_(.*?)_key"').exec(err.message);
                     break;
             }
@@ -109,7 +108,7 @@ const prettifyConstraintError = (err, request) => {
                     break;
                 case 'postgres':
                     const resourceName = (0, exports.resolveSynonym)(request);
-                    const abstractSqlModel = getFinalAbstractSqlModel(request);
+                    const abstractSqlModel = (0, exports.getAbstractSqlModel)(request);
                     const tableName = abstractSqlModel.tables[resourceName].name;
                     matches = new RegExp('"' +
                         tableName +
@@ -130,7 +129,7 @@ const prettifyConstraintError = (err, request) => {
         }
         if (err instanceof exports.db.CheckConstraintError) {
             const resourceName = (0, exports.resolveSynonym)(request);
-            const abstractSqlModel = getFinalAbstractSqlModel(request);
+            const abstractSqlModel = (0, exports.getAbstractSqlModel)(request);
             const table = abstractSqlModel.tables[resourceName];
             if (table.checks) {
                 switch (exports.db.engine) {
@@ -144,7 +143,7 @@ const prettifyConstraintError = (err, request) => {
             if (matches != null) {
                 const checkName = matches[1];
                 const check = table.checks.find((c) => c.name === checkName);
-                if ((check === null || check === void 0 ? void 0 : check.description) != null) {
+                if (check?.description != null) {
                     throw new errors_1.BadRequestError(check.description);
                 }
             }
@@ -168,11 +167,7 @@ const isModelNew = async (tx, modelName) => {
 };
 exports.isModelNew = isModelNew;
 const validateModel = async (tx, modelName, request) => {
-    const { sql } = models[modelName];
-    if (!sql) {
-        throw new Error(`Tried to validate a virtual model: '${modelName}'`);
-    }
-    await Promise.all(sql.rules.map(async (rule) => {
+    await Promise.all(models[modelName].sql.rules.map(async (rule) => {
         if (!(0, abstract_sql_1.isRuleAffected)(rule, request)) {
             return;
         }
@@ -196,8 +191,8 @@ const generateAbstractSqlModel = (lfModel) => (0, cached_compile_1.cachedCompile
 exports.generateAbstractSqlModel = generateAbstractSqlModel;
 const generateSqlModel = (abstractSql, targetDatabaseEngine) => (0, cached_compile_1.cachedCompile)('sqlModel', package_json_1.version + '+' + targetDatabaseEngine, abstractSql, () => AbstractSQLCompiler[targetDatabaseEngine].compileSchema(abstractSql));
 exports.generateSqlModel = generateSqlModel;
-function generateModels(model, targetDatabaseEngine) {
-    const { apiRoot: vocab, modelText: se, translateTo, translations } = model;
+const generateModels = (model, targetDatabaseEngine) => {
+    const { apiRoot: vocab, modelText: se } = model;
     let { abstractSql: maybeAbstractSql } = model;
     let lf;
     if (se) {
@@ -219,78 +214,48 @@ function generateModels(model, targetDatabaseEngine) {
     const abstractSql = maybeAbstractSql;
     const odataMetadata = (0, cached_compile_1.cachedCompile)('metadata', odata_metadata_generator_1.generateODataMetadata.version, { vocab, abstractSqlModel: abstractSql }, () => (0, odata_metadata_generator_1.generateODataMetadata)(vocab, abstractSql));
     let sql;
-    let resourceRenames;
-    if (translateTo != null) {
-        resourceRenames = (0, translations_1.translateAbstractSqlModel)(abstractSql, models[translateTo].abstractSql, model.apiRoot, translateTo, translations);
+    try {
+        sql = (0, exports.generateSqlModel)(abstractSql, targetDatabaseEngine);
     }
-    else {
-        for (const [key, table] of Object.entries(abstractSql.tables)) {
-            abstractSql.tables[`${key}$${model.apiRoot}`] = { ...table };
-        }
-        try {
-            sql = (0, exports.generateSqlModel)(abstractSql, targetDatabaseEngine);
-        }
-        catch (e) {
-            console.error(`Error compiling model '${vocab}':`, e);
-            throw new Error(`Error compiling model '${vocab}': ` + e);
-        }
+    catch (e) {
+        console.error(`Error compiling model '${vocab}':`, e);
+        throw new Error(`Error compiling model '${vocab}': ` + e);
     }
-    return {
-        vocab,
-        translateTo,
-        resourceRenames,
-        se,
-        lf,
-        abstractSql,
-        sql,
-        odataMetadata,
-    };
-}
+    return { vocab, se, lf, abstractSql, sql, odataMetadata };
+};
 exports.generateModels = generateModels;
 const executeModel = (tx, model) => (0, exports.executeModels)(tx, [model]);
 exports.executeModel = executeModel;
 const executeModels = async (tx, execModels) => {
     try {
         const compiledModels = await Promise.all(execModels.map(async (model) => {
-            var _a, _b, _c, _d;
             const { apiRoot } = model;
             await syncMigrator.run(tx, model);
-            const compiledModel = generateModels(model, exports.db.engine);
-            if (compiledModel.sql) {
-                for (const createStatement of compiledModel.sql.createSchema) {
-                    const promise = tx.executeSql(createStatement);
-                    if (exports.db.engine === 'websql') {
-                        promise.catch((err) => {
-                            console.warn("Ignoring errors in the create table statements for websql as it doesn't support CREATE IF NOT EXISTS", err);
-                        });
-                    }
-                    await promise;
+            const compiledModel = (0, exports.generateModels)(model, exports.db.engine);
+            for (const createStatement of compiledModel.sql.createSchema) {
+                const promise = tx.executeSql(createStatement);
+                if (exports.db.engine === 'websql') {
+                    promise.catch((err) => {
+                        console.warn("Ignoring errors in the create table statements for websql as it doesn't support CREATE IF NOT EXISTS", err);
+                    });
                 }
+                await promise;
             }
             await syncMigrator.postRun(tx, model);
             odataResponse.prepareModel(compiledModel.abstractSql);
             deepFreeze(compiledModel.abstractSql);
-            const versions = [apiRoot];
-            if (compiledModel.translateTo != null) {
-                versions.push(...models[compiledModel.translateTo].versions);
-            }
-            models[apiRoot] = {
-                ...compiledModel,
-                versions,
-            };
-            if (compiledModel.sql) {
-                await (0, exports.validateModel)(tx, apiRoot);
-            }
+            models[apiRoot] = compiledModel;
+            await (0, exports.validateModel)(tx, apiRoot);
             exports.api[apiRoot] = new PinejsClient('/' + apiRoot + '/');
             exports.api[apiRoot].logger = { ...console };
             if (model.logging != null) {
-                const defaultSetting = (_b = (_a = model.logging) === null || _a === void 0 ? void 0 : _a.default) !== null && _b !== void 0 ? _b : true;
+                const defaultSetting = model.logging?.default ?? true;
                 const { logger } = exports.api[apiRoot];
                 for (const k of Object.keys(model.logging)) {
                     const key = k;
                     if (key !== 'Console' &&
                         typeof logger[key] === 'function' &&
-                        !((_d = (_c = model.logging) === null || _c === void 0 ? void 0 : _c[key]) !== null && _d !== void 0 ? _d : defaultSetting)) {
+                        !(model.logging?.[key] ?? defaultSetting)) {
                         logger[key] = _.noop;
                     }
                 }
@@ -299,7 +264,6 @@ const executeModels = async (tx, execModels) => {
         }));
         await Promise.all(compiledModels.map(async (model) => {
             const updateModel = async (modelType) => {
-                var _a;
                 if (model[modelType] == null) {
                     return await exports.api.dev.delete({
                         resource: 'model',
@@ -333,10 +297,12 @@ const executeModels = async (tx, execModels) => {
                 let uri = '/dev/model';
                 const body = {
                     is_of__vocabulary: model.vocab,
-                    model_value: model[modelType],
+                    model_value: typeof model[modelType] === 'string'
+                        ? { value: model[modelType] }
+                        : model[modelType],
                     model_type: modelType,
                 };
-                const id = (_a = result === null || result === void 0 ? void 0 : result[0]) === null || _a === void 0 ? void 0 : _a.id;
+                const id = result?.[0]?.id;
                 if (id != null) {
                     uri += '(' + id + ')';
                     method = 'PATCH';
@@ -366,26 +332,23 @@ const cleanupModel = (vocab) => {
     delete exports.api[vocab];
 };
 const deleteModel = async (vocabulary) => {
-    const { sql } = models[vocabulary];
-    if (sql) {
-        await exports.db.transaction(async (tx) => {
-            const dropStatements = sql.dropSchema.map((dropStatement) => tx.executeSql(dropStatement));
-            await Promise.all(dropStatements.concat([
-                exports.api.dev.delete({
-                    resource: 'model',
-                    passthrough: {
-                        tx,
-                        req: permissions.root,
+    await exports.db.transaction(async (tx) => {
+        const dropStatements = models[vocabulary].sql.dropSchema.map((dropStatement) => tx.executeSql(dropStatement));
+        await Promise.all(dropStatements.concat([
+            exports.api.dev.delete({
+                resource: 'model',
+                passthrough: {
+                    tx,
+                    req: permissions.root,
+                },
+                options: {
+                    $filter: {
+                        is_of__vocabulary: vocabulary,
                     },
-                    options: {
-                        $filter: {
-                            is_of__vocabulary: vocabulary,
-                        },
-                    },
-                }),
-            ]));
-        });
-    }
+                },
+            }),
+        ]));
+    });
     await cleanupModel(vocabulary);
 };
 exports.deleteModel = deleteModel;
@@ -588,16 +551,10 @@ const runURI = async (method, uri, body = {}, tx, req, custom) => {
 };
 exports.runURI = runURI;
 const getAbstractSqlModel = (request) => {
-    var _a;
-    return ((_a = request.abstractSqlModel) !== null && _a !== void 0 ? _a : (request.abstractSqlModel = models[request.vocabulary].abstractSql));
+    return (request.abstractSqlModel ??= models[request.vocabulary].abstractSql);
 };
 exports.getAbstractSqlModel = getAbstractSqlModel;
-const getFinalAbstractSqlModel = (request) => {
-    var _a;
-    const finalModel = _.last(request.translateVersions);
-    return ((_a = request.finalAbstractSqlModel) !== null && _a !== void 0 ? _a : (request.finalAbstractSqlModel = models[finalModel].abstractSql));
-};
-const getIdField = (request) => getFinalAbstractSqlModel(request).tables[(0, exports.resolveSynonym)(request)].idField;
+const getIdField = (request) => (0, exports.getAbstractSqlModel)(request).tables[(0, exports.resolveSynonym)(request)].idField;
 const getAffectedIds = async (args) => {
     const { request } = args;
     if (request.affectedIds) {
@@ -613,8 +570,6 @@ const getAffectedIds = async (args) => {
 };
 exports.getAffectedIds = getAffectedIds;
 const $getAffectedIds = async ({ req, request, tx, }) => {
-    var _a;
-    var _b;
     if (!['PATCH', 'DELETE'].includes(request.method)) {
         throw new Error('Can only call `getAffectedIds` with PATCH/DELETE requests');
     }
@@ -623,7 +578,6 @@ const $getAffectedIds = async ({ req, request, tx, }) => {
         url: `/${request.vocabulary}${request.url}`,
     });
     parsedRequest.engine = request.engine;
-    parsedRequest.translateVersions = request.translateVersions;
     let affectedRequest = parsedRequest;
     const abstractSqlModel = (0, exports.getAbstractSqlModel)(affectedRequest);
     const resourceName = (0, exports.resolveSynonym)(affectedRequest);
@@ -632,7 +586,7 @@ const $getAffectedIds = async ({ req, request, tx, }) => {
         throw new Error('Unknown resource: ' + affectedRequest.resourceName);
     }
     const { idField } = resourceTable;
-    (_a = (_b = affectedRequest.odataQuery).options) !== null && _a !== void 0 ? _a : (_b.options = {});
+    affectedRequest.odataQuery.options ??= {};
     affectedRequest.odataQuery.options.$select = {
         properties: [{ name: idField }],
     };
@@ -654,14 +608,10 @@ const runODataRequest = (req, vocabulary) => {
     if (module_1.env.DEBUG) {
         exports.api[vocabulary].logger.log('Parsing', req.method, req.url);
     }
-    const { versions } = models[vocabulary];
-    const reqHooks = versions.map((version) => [
-        version,
-        (0, hooks_1.getHooks)({
-            method: req.method,
-            vocabulary: version,
-        }, version === versions[0]),
-    ]);
+    const reqHooks = (0, hooks_1.getHooks)({
+        method: req.method,
+        vocabulary,
+    });
     const transactions = [];
     const tryCancelRequest = () => {
         transactions.forEach(async (tx) => {
@@ -697,33 +647,14 @@ const runODataRequest = (req, vocabulary) => {
             }
             const prepareRequest = async (parsedRequest) => {
                 parsedRequest.engine = exports.db.engine;
-                parsedRequest.translateVersions = [...versions];
                 const $request = parsedRequest;
+                $request.hooks = (0, hooks_1.getHooks)($request);
                 try {
-                    $request.hooks = [];
-                    for (const version of versions) {
-                        const hooks = [
-                            version,
-                            (0, hooks_1.getHooks)({
-                                resourceName: $request.resourceName,
-                                vocabulary: version,
-                                method: $request.method,
-                            }, version === versions[0]),
-                        ];
-                        $request.hooks.push(hooks);
-                        await (0, hooks_1.runHooks)('POSTPARSE', [hooks], {
-                            req,
-                            request: $request,
-                            tx: req.tx,
-                        });
-                        const { resourceRenames } = models[version];
-                        if (resourceRenames) {
-                            const resourceName = (0, exports.resolveSynonym)($request);
-                            if (resourceRenames[resourceName]) {
-                                $request.resourceName = (0, odata_to_abstract_sql_1.sqlNameToODataName)(resourceRenames[resourceName]);
-                            }
-                        }
-                    }
+                    await (0, hooks_1.runHooks)('POSTPARSE', $request.hooks, {
+                        req,
+                        request: $request,
+                        tx: req.tx,
+                    });
                     const translatedRequest = await uriParser.translateUri($request);
                     return await (0, abstract_sql_1.compileRequest)(translatedRequest);
                 }
@@ -940,13 +871,12 @@ const runRequest = async (req, tx, request) => {
     return await prepareResponse(req, request, result, tx);
 };
 const runChangeSet = (req, tx) => async (changeSetResults, request) => {
-    var _a;
     request = updateBinds(changeSetResults, request);
     const result = await runRequest(req, tx, request);
     if (request.id == null) {
         throw new Error('No request id');
     }
-    (_a = result.headers) !== null && _a !== void 0 ? _a : (result.headers = {});
+    result.headers ??= {};
     result.headers['content-id'] = request.id;
     changeSetResults.set(request.id, result);
 };
@@ -955,7 +885,7 @@ const updateBinds = (changeSetResults, request) => {
         request.odataBinds = request.odataBinds.map(([tag, id]) => {
             if (tag === 'ContentReference') {
                 const ref = changeSetResults.get(id);
-                if ((ref === null || ref === void 0 ? void 0 : ref.body) == null ||
+                if (ref?.body == null ||
                     typeof ref.body === 'string' ||
                     ref.body.id === undefined) {
                     throw new errors_1.BadRequestError('Reference to a non existing resource in Changeset');
@@ -993,9 +923,7 @@ const checkReadOnlyRequests = (request) => {
     if (hooks == null) {
         return true;
     }
-    return hooks.every(([, versionedHooks]) => Object.values(versionedHooks).every((hookTypeHooks) => {
-        return (hookTypeHooks == null || hookTypeHooks.every((hook) => hook.readOnlyTx));
-    }));
+    return Object.values(hooks).every((hookTypeHooks) => hookTypeHooks == null || hookTypeHooks.every((hook) => hook.readOnlyTx));
 };
 const runTransaction = async (req, request, callback) => {
     if (req.tx != null) {
@@ -1012,7 +940,6 @@ const runTransaction = async (req, request, callback) => {
     return await exports.db.transaction(callback);
 };
 const runQuery = async (tx, request, queryIndex, returningIdField) => {
-    var _a;
     const { vocabulary } = request;
     let { sqlQuery } = request;
     if (sqlQuery == null) {
@@ -1034,7 +961,7 @@ const runQuery = async (tx, request, queryIndex, returningIdField) => {
     }
     const sqlResult = await tx.executeSql(query, values, returningIdField);
     if (returningIdField) {
-        (_a = request.affectedIds) !== null && _a !== void 0 ? _a : (request.affectedIds = sqlResult.rows.map((row) => row[returningIdField]));
+        request.affectedIds ??= sqlResult.rows.map((row) => row[returningIdField]);
     }
     return sqlResult;
 };
@@ -1044,14 +971,13 @@ const runGet = async (_req, request, tx) => {
     }
 };
 const respondGet = async (req, request, result, tx) => {
-    var _a;
     const vocab = request.vocabulary;
     if (request.sqlQuery != null) {
-        const format = (_a = request.odataQuery.options) === null || _a === void 0 ? void 0 : _a.$format;
+        const format = request.odataQuery.options?.$format;
         const metadata = format != null && typeof format === 'object'
             ? format.metadata
             : undefined;
-        const d = await odataResponse.process(vocab, (0, exports.getAbstractSqlModel)(request), request.originalResourceName, result.rows, { includeMetadata: metadata === 'full' });
+        const d = await odataResponse.process(vocab, (0, exports.getAbstractSqlModel)(request), request.resourceName, result.rows, { includeMetadata: metadata === 'full' });
         const response = {
             statusCode: 200,
             body: { d },
@@ -1087,19 +1013,18 @@ const runPost = async (_req, request, tx) => {
     if (rowsAffected === 0) {
         throw new errors_1.PermissionError();
     }
-    await (0, exports.validateModel)(tx, _.last(request.translateVersions), request);
+    await (0, exports.validateModel)(tx, request.vocabulary, request);
     return insertId;
 };
 const respondPost = async (req, request, id, tx) => {
-    var _a, _b;
     const vocab = request.vocabulary;
-    const location = odataResponse.resourceURI(vocab, request.originalResourceName, id);
+    const location = odataResponse.resourceURI(vocab, request.resourceName, id);
     if (module_1.env.DEBUG) {
         exports.api[vocab].logger.log('Insert ID: ', request.resourceName, id);
     }
     let result = { d: [{ id }] };
     if (location != null &&
-        !['0', 'false'].includes((_b = (_a = request === null || request === void 0 ? void 0 : request.odataQuery) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.returnResource)) {
+        !['0', 'false'].includes(request?.odataQuery?.options?.returnResource)) {
         try {
             result = (await (0, exports.runURI)('GET', location, undefined, tx, req));
         }
@@ -1136,7 +1061,7 @@ const runPut = async (_req, request, tx) => {
         ({ rowsAffected } = await runQuery(tx, request, undefined, idField));
     }
     if (rowsAffected > 0) {
-        await (0, exports.validateModel)(tx, _.last(request.translateVersions), request);
+        await (0, exports.validateModel)(tx, request.vocabulary, request);
     }
     return undefined;
 };
@@ -1158,7 +1083,7 @@ const respondOptions = respondPut;
 const runDelete = async (_req, request, tx) => {
     const { rowsAffected } = await runQuery(tx, request, undefined, getIdField(request));
     if (rowsAffected > 0) {
-        await (0, exports.validateModel)(tx, _.last(request.translateVersions), request);
+        await (0, exports.validateModel)(tx, request.vocabulary, request);
     }
     return undefined;
 };
@@ -1175,6 +1100,30 @@ const executeStandardModels = async (tx) => {
 					ALTER TABLE "model"
 					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 "model"
+								MODIFY "model value" JSON NOT NULL;
+
+								UPDATE "model"
+								SET "model value" = CAST('{"value":' || CAST("model value" AS CHAR) || '}' AS JSON)
+								WHERE "model type" IN ('se', 'odataMetadata')
+								AND CAST("model value" AS CHAR) LIKE '"%';`);
+                            break;
+                        case 'postgres':
+                            await $tx.executeSql(`\
+								ALTER TABLE "model"
+								ALTER COLUMN "model value" SET DATA TYPE JSONB USING "model value"::JSONB;
+
+								UPDATE "model"
+								SET "model value" = CAST('{"value":' || CAST("model value" AS TEXT) || '}' AS JSON)
+								WHERE "model type" IN ('se', 'odataMetadata')
+								AND CAST("model value" AS TEXT) LIKE '"%';`);
+                            break;
+                    }
+                },
             },
         });
         await (0, exports.executeModels)(tx, permissions.config.models);