@balena/pinejs 19.7.2-build-renovate-postgres-17-x-38c77839796930404f59a924e2e4573ffdc6405d-1 → 19.7.2-build-esm-ce2a147ed7533c40f456b27f17ac4e559a0f9da8-1

package/.versionbot/CHANGELOG.yml

@@ -1,16 +1,15 @@
 - commits:
-    - subject: Update postgres Docker tag to v17
-      hash: 38c77839796930404f59a924e2e4573ffdc6405d
-      body: |
-        Update postgres from 16 to 17
+    - subject: Convert to ESM
+      hash: ce2a147ed7533c40f456b27f17ac4e559a0f9da8
+      body: ""
       footer:
         Change-type: patch
         change-type: patch
-      author: balena-renovate[bot]
+      author: Pagan Gazzard
       nested: []
   version: 19.7.2
   title: ""
-  date: 2024-12-30T14:55:30.566Z
+  date: 2024-12-30T17:58:42.550Z
 - commits:
     - subject: Use/export explicit functions for loading SBVR files
       hash: c47a755613fec8293547c7cfb34cc9e707a7c703

package/CHANGELOG.md

@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 # v19.7.2
 ## (2024-12-30)
 
-* Update postgres Docker tag to v17 [balena-renovate[bot]]
+* Convert to ESM [Pagan Gazzard]
 
 # v19.7.1
 ## (2024-12-30)

package/{Gruntfile.ts → Gruntfile.cts}

@@ -3,9 +3,9 @@ import type { WebpackPluginInstance } from 'webpack';
 
 import _ from 'lodash';
 import TerserPlugin from 'terser-webpack-plugin';
-import browserConfig from './build/browser';
-import moduleConfig from './build/module';
-import serverConfig from './build/server';
+import browserConfig from './build/browser.cts';
+import moduleConfig from './build/module.cts';
+import serverConfig from './build/server.cts';
 
 const serverConfigs = {
 	browser: browserConfig,
@@ -110,30 +110,18 @@ export = (grunt: typeof Grunt) => {
 			return renames;
 		})(),
 
-		replace: {
-			'pine.js': {
+		replace: _.mapValues(serverConfigs, (_config, task) => {
+			return {
 				src: 'out/pine.js',
 				overwrite: true,
 				replacements: [
 					{
-						from: /nodeRequire/g,
-						to: 'require',
+						from: /sourceMappingURL=pine.js.map/g,
+						to: `sourceMappingURL=pine-${task}-<%= grunt.option('version') %>.js.map`,
 					},
 				],
-			},
-			..._.mapValues(serverConfigs, (_config, task) => {
-				return {
-					src: 'out/pine.js',
-					overwrite: true,
-					replacements: [
-						{
-							from: /sourceMappingURL=pine.js.map/g,
-							to: `sourceMappingURL=pine-${task}-<%= grunt.option('version') %>.js.map`,
-						},
-					],
-				};
-			}),
-		},
+			};
+		}),
 
 		webpack: serverConfigs,
 
@@ -167,7 +155,6 @@ export = (grunt: typeof Grunt) => {
 			'webpack:' + task,
 			'gitinfo:describe',
 			'version',
-			'replace:pine.js',
 			`replace:${task}`,
 			`concat:${task}`,
 			`rename:${task}`,

package/bin/abstract-sql-compiler.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../out/bin/abstract-sql-compiler');
+import '../out/bin/abstract-sql-compiler.js';

package/bin/odata-compiler.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../out/bin/odata-compiler');
+import '../out/bin/odata-compiler.js';

package/bin/sbvr-compiler.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../out/bin/sbvr-compiler');
+import '../out/bin/sbvr-compiler.js';

package/build/{browser.ts → browser.cts}

@@ -1,6 +1,6 @@
 import * as webpack from 'webpack';
 import type { Configuration } from 'webpack';
-import sharedConfig from './config';
+import sharedConfig from './config.cts';
 
 if (typeof sharedConfig.externals !== 'object') {
 	throw new Error('Expected externals to be an object');

package/build/{config.ts → config.cts}

@@ -1,4 +1,4 @@
-import type { RequiredField } from '../src/sbvr-api/common-types';
+import type { RequiredField } from '../src/sbvr-api/common-types.js' with { 'resolution-mode': 'import' };
 
 import * as path from 'path';
 import * as webpack from 'webpack';
@@ -46,6 +46,10 @@ const config: RequiredField<
 	},
 	resolve: {
 		extensions: ['.js', '.ts'],
+		extensionAlias: {
+			'.js': ['.ts', '.js'],
+			'.mjs': ['.mts', '.mjs'],
+		},
 	},
 	plugins: [new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 })],
 	module: {

package/build/{module.ts → module.cts}

@@ -1,6 +1,6 @@
 import * as webpack from 'webpack';
 import type { Configuration } from 'webpack';
-import sharedConfig from './config';
+import sharedConfig from './config.cts';
 
 const config: Configuration = {
 	...sharedConfig,

package/build/{server.ts → server.cts}

@@ -1,6 +1,6 @@
 import * as webpack from 'webpack';
 import type { Configuration } from 'webpack';
-import sharedConfig from './config';
+import sharedConfig from './config.cts';
 
 const config: Configuration = {
 	...sharedConfig,

package/docker-compose.npm-test.yml

@@ -1,7 +1,7 @@
 version: "2.1"
 services:
   postgres:
-    image: postgres:17-alpine
+    image: postgres:16-alpine
     environment:
       POSTGRES_USER: docker
       POSTGRES_PASSWORD: docker

package/out/bin/abstract-sql-compiler.js

@@ -1,34 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("./utils");
-const commander_1 = require("commander");
+import { getAbstractSqlModelFromFile, version, writeAll, writeSqlModel, } from './utils.js';
+import { program } from 'commander';
 const runCompile = async (inputFile, outputFile) => {
     const { generateSqlModel } = await import('../sbvr-api/sbvr-utils.js');
-    const abstractSql = (0, utils_1.getAbstractSqlModelFromFile)(inputFile, commander_1.program.opts().model);
-    const sqlModel = generateSqlModel(abstractSql, commander_1.program.opts().engine);
-    (0, utils_1.writeSqlModel)(sqlModel, outputFile);
+    const abstractSql = await getAbstractSqlModelFromFile(inputFile, program.opts().model);
+    const sqlModel = generateSqlModel(abstractSql, program.opts().engine);
+    writeSqlModel(sqlModel, outputFile);
 };
 const generateTypes = async (inputFile, options) => {
     const { abstractSqlToTypescriptTypes } = await import('@balena/abstract-sql-to-typescript/generate');
-    const abstractSql = (0, utils_1.getAbstractSqlModelFromFile)(inputFile, commander_1.program.opts().model);
+    const abstractSql = await getAbstractSqlModelFromFile(inputFile, program.opts().model);
     const types = abstractSqlToTypescriptTypes(abstractSql, {
         convertSerialToInteger: options.convertSerialToInteger,
     });
-    (0, utils_1.writeAll)(types, options.outputFile);
+    writeAll(types, options.outputFile);
 };
-commander_1.program
-    .version(utils_1.version)
+program
+    .version(version)
     .option('-e, --engine <engine>', 'The target database engine (postgres|websql|mysql), default: postgres', /postgres|websql|mysql/, 'postgres')
     .option('-m, --model <model-name>', 'The target model for config files with multiple models, default: first model');
-commander_1.program
+program
     .command('compile <input-file> [output-file]')
     .description('compile the input AbstractSql model into SQL')
     .action(runCompile);
-commander_1.program
+program
     .command('compile-schema <input-file> [output-file]')
     .description('compile the input AbstractSql model into SQL')
     .action(runCompile);
-commander_1.program
+program
     .command('generate-types <input-file> [output-file]')
     .description('generate typescript types from the input AbstractSql')
     .option('--convert-serial-to-integer', 'Convert serials to integers')
@@ -38,13 +36,13 @@ commander_1.program
         convertSerialToInteger: opts.convertSerialToInteger,
     });
 });
-commander_1.program
+program
     .command('help')
     .description('print the help')
-    .action(() => commander_1.program.help());
-commander_1.program.arguments('<input-file> [output-file]').action(runCompile);
+    .action(() => program.help());
+program.arguments('<input-file> [output-file]').action(runCompile);
 if (process.argv.length === 2) {
-    commander_1.program.help();
+    program.help();
 }
-void commander_1.program.parseAsync(process.argv);
+void program.parseAsync(process.argv);
 //# sourceMappingURL=abstract-sql-compiler.js.map

package/out/bin/abstract-sql-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-sql-compiler.js","sourceRoot":"","sources":["../../src/bin/abstract-sql-compiler.ts"],"names":[],"mappings":";;AAAA,mCAKiB;AAEjB,yCAAoC;AAEpC,MAAM,UAAU,GAAG,KAAK,EAAE,SAAiB,EAAE,UAAmB,EAAE,EAAE;IACnE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,IAAA,mCAA2B,EAC9C,SAAS,EACT,mBAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CACpB,CAAC;IACF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,EAAE,mBAAO,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;IAEtE,IAAA,qBAAa,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAC1B,SAAiB,EACjB,OAGC,EACA,EAAE;IACH,MAAM,EAAE,4BAA4B,EAAE,GAAG,MAAM,MAAM,CACpD,6CAA6C,CAC7C,CAAC;IACF,MAAM,WAAW,GAAG,IAAA,mCAA2B,EAC9C,SAAS,EACT,mBAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CACpB,CAAC;IACF,MAAM,KAAK,GAAG,4BAA4B,CAAC,WAAW,EAAE;QACvD,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;KACtD,CAAC,CAAC;IAEH,IAAA,gBAAQ,EAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,mBAAO;KACL,OAAO,CAAC,eAAO,CAAC;KAChB,MAAM,CACN,uBAAuB,EACvB,uEAAuE,EACvE,uBAAuB,EACvB,UAAU,CACV;KACA,MAAM,CACN,0BAA0B,EAC1B,8EAA8E,CAC9E,CAAC;AAEH,mBAAO;KACL,OAAO,CAAC,oCAAoC,CAAC;KAC7C,WAAW,CAAC,8CAA8C,CAAC;KAC3D,MAAM,CAAC,UAAU,CAAC,CAAC;AAErB,mBAAO;KACL,OAAO,CAAC,2CAA2C,CAAC;KACpD,WAAW,CAAC,8CAA8C,CAAC;KAC3D,MAAM,CAAC,UAAU,CAAC,CAAC;AAErB,mBAAO;KACL,OAAO,CAAC,2CAA2C,CAAC;KACpD,WAAW,CAAC,sDAAsD,CAAC;KACnE,MAAM,CAAC,6BAA6B,EAAE,6BAA6B,CAAC;KACpE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;IAC7C,MAAM,aAAa,CAAC,SAAS,EAAE;QAC9B,UAAU;QACV,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;KACnD,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEJ,mBAAO;KACL,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,gBAAgB,CAAC;KAC7B,MAAM,CAAC,GAAG,EAAE,CAAC,mBAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AAE/B,mBAAO,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAEnE,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC/B,mBAAO,CAAC,IAAI,EAAE,CAAC;AAChB,CAAC;AAED,KAAK,mBAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"abstract-sql-compiler.js","sourceRoot":"","sources":["../../src/bin/abstract-sql-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,2BAA2B,EAC3B,OAAO,EACP,QAAQ,EACR,aAAa,GACb,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,UAAU,GAAG,KAAK,EAAE,SAAiB,EAAE,UAAmB,EAAE,EAAE;IACnE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,MAAM,2BAA2B,CACpD,SAAS,EACT,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CACpB,CAAC;IACF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;IAEtE,aAAa,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,KAAK,EAC1B,SAAiB,EACjB,OAGC,EACA,EAAE;IACH,MAAM,EAAE,4BAA4B,EAAE,GAAG,MAAM,MAAM,CACpD,6CAA6C,CAC7C,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,2BAA2B,CACpD,SAAS,EACT,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CACpB,CAAC;IACF,MAAM,KAAK,GAAG,4BAA4B,CAAC,WAAW,EAAE;QACvD,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;KACtD,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,OAAO;KACL,OAAO,CAAC,OAAO,CAAC;KAChB,MAAM,CACN,uBAAuB,EACvB,uEAAuE,EACvE,uBAAuB,EACvB,UAAU,CACV;KACA,MAAM,CACN,0BAA0B,EAC1B,8EAA8E,CAC9E,CAAC;AAEH,OAAO;KACL,OAAO,CAAC,oCAAoC,CAAC;KAC7C,WAAW,CAAC,8CAA8C,CAAC;KAC3D,MAAM,CAAC,UAAU,CAAC,CAAC;AAErB,OAAO;KACL,OAAO,CAAC,2CAA2C,CAAC;KACpD,WAAW,CAAC,8CAA8C,CAAC;KAC3D,MAAM,CAAC,UAAU,CAAC,CAAC;AAErB,OAAO;KACL,OAAO,CAAC,2CAA2C,CAAC;KACpD,WAAW,CAAC,sDAAsD,CAAC;KACnE,MAAM,CAAC,6BAA6B,EAAE,6BAA6B,CAAC;KACpE,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE;IAC7C,MAAM,aAAa,CAAC,SAAS,EAAE;QAC9B,UAAU;QACV,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;KACnD,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEJ,OAAO;KACL,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,gBAAgB,CAAC;KAC7B,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AAE/B,OAAO,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AAEnE,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC/B,OAAO,CAAC,IAAI,EAAE,CAAC;AAChB,CAAC;AAED,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/out/bin/odata-compiler.js

@@ -1,13 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("./utils");
-const commander_1 = require("commander");
+import { getAbstractSqlModelFromFile, version, writeAll } from './utils.js';
+import { program } from 'commander';
 const generateAbstractSqlQuery = async (abstractSqlModel, odata) => {
     const { memoizedParseOdata, translateUri } = await import('../sbvr-api/uri-parser.js');
     const odataAST = memoizedParseOdata(odata);
     const vocabulary = '';
     return translateUri({
-        engine: commander_1.program.opts().engine,
+        engine: program.opts().engine,
         method: 'GET',
         url: odata,
         resourceName: odataAST.tree.resource,
@@ -25,12 +23,12 @@ const parseOData = async (odata, outputFile) => {
     const { memoizedParseOdata } = await import('../sbvr-api/uri-parser.js');
     const result = memoizedParseOdata(odata);
     const json = JSON.stringify(result, null, 2);
-    (0, utils_1.writeAll)(json, outputFile);
+    writeAll(json, outputFile);
 };
 const translateOData = async (modelFile, odata, outputFile) => {
-    const request = await generateAbstractSqlQuery((0, utils_1.getAbstractSqlModelFromFile)(modelFile, commander_1.program.opts().model), odata);
+    const request = await generateAbstractSqlQuery(await getAbstractSqlModelFromFile(modelFile, program.opts().model), odata);
     const json = JSON.stringify(request.abstractSqlQuery, null, 2);
-    (0, utils_1.writeAll)(json, outputFile);
+    writeAll(json, outputFile);
 };
 const formatSqlQuery = (sqlQuery) => {
     if (Array.isArray(sqlQuery)) {
@@ -44,43 +42,43 @@ Bindings: ${JSON.stringify(sqlQuery.bindings, null, 2)}
     }
 };
 const compileOData = async (modelFile, odata, outputFile) => {
-    const translatedRequest = await generateAbstractSqlQuery((0, utils_1.getAbstractSqlModelFromFile)(modelFile, commander_1.program.opts().model), odata);
+    const translatedRequest = await generateAbstractSqlQuery(await getAbstractSqlModelFromFile(modelFile, program.opts().model), odata);
     const { compileRequest } = await import('../sbvr-api/abstract-sql.js');
     const compiledRequest = compileRequest(translatedRequest);
     let output;
-    if (commander_1.program.opts().json) {
+    if (program.opts().json) {
         output = JSON.stringify(compiledRequest.sqlQuery, null, 2);
     }
     else {
         output = formatSqlQuery(compiledRequest.sqlQuery);
     }
-    (0, utils_1.writeAll)(output, outputFile);
+    writeAll(output, outputFile);
 };
-commander_1.program
-    .version(utils_1.version)
+program
+    .version(version)
     .option('-e, --engine <engine>', 'The target database engine (postgres|websql|mysql), default: postgres', /postgres|websql|mysql/, 'postgres')
     .option('--json', 'Force json output, default: false');
-commander_1.program
+program
     .command('parse <input-url> [output-file]')
     .description('parse the input OData URL into OData AST')
     .action(parseOData);
-commander_1.program
+program
     .command('translate <model-file> <input-url> [output-file]')
     .description('translate the input OData URL into abstract SQL')
     .option('-m, --model <model-name>', 'The target model for config files with multiple models, default: first model')
     .action(translateOData);
-commander_1.program
+program
     .command('compile <model-file> <input-url> [output-file]')
     .description('compile the input OData URL into SQL')
     .option('-m, --model <model-name>', 'The target model for config files with multiple models, default: first model')
     .action(compileOData);
-commander_1.program
+program
     .command('help')
     .description('print the help')
-    .action(() => commander_1.program.help());
-commander_1.program.arguments('<sbvr-file> <input-url> [output-file]').action(compileOData);
+    .action(() => program.help());
+program.arguments('<sbvr-file> <input-url> [output-file]').action(compileOData);
 if (process.argv.length === 2) {
-    commander_1.program.help();
+    program.help();
 }
-void commander_1.program.parseAsync(process.argv);
+void program.parseAsync(process.argv);
 //# sourceMappingURL=odata-compiler.js.map

package/out/bin/odata-compiler.js.map

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

package/out/bin/sbvr-compiler.js

@@ -1,48 +1,13 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("./utils");
-const commander_1 = require("commander");
-const fs = __importStar(require("fs"));
+import { version, writeAll, writeSqlModel } from './utils.js';
+import { program } from 'commander';
+import fs from 'fs';
 const getSE = (inputFile) => fs.readFileSync(inputFile, 'utf8');
 const parse = async (inputFile, outputFile) => {
     const { generateLfModel } = await import('../sbvr-api/sbvr-utils.js');
     const seModel = getSE(inputFile);
     const result = generateLfModel(seModel);
     const json = JSON.stringify(result, null, 2);
-    (0, utils_1.writeAll)(json, outputFile);
+    writeAll(json, outputFile);
 };
 const transform = async (inputFile, outputFile) => {
     const { generateLfModel, generateAbstractSqlModel } = await import('../sbvr-api/sbvr-utils.js');
@@ -50,13 +15,13 @@ const transform = async (inputFile, outputFile) => {
     const lfModel = generateLfModel(seModel);
     const result = generateAbstractSqlModel(lfModel);
     const json = JSON.stringify(result, null, 2);
-    (0, utils_1.writeAll)(json, outputFile);
+    writeAll(json, outputFile);
 };
 const runCompile = async (inputFile, outputFile) => {
     const { generateModels } = await import('../sbvr-api/sbvr-utils.js');
     const seModel = getSE(inputFile);
-    const models = generateModels({ apiRoot: 'sbvr-compiler', modelText: seModel }, commander_1.program.opts().engine);
-    (0, utils_1.writeSqlModel)(models.sql, outputFile);
+    const models = generateModels({ apiRoot: 'sbvr-compiler', modelText: seModel }, program.opts().engine);
+    writeSqlModel(models.sql, outputFile);
 };
 const generateTypes = async (inputFile, outputFile) => {
     const { generateLfModel, generateAbstractSqlModel } = await import('../sbvr-api/sbvr-utils.js');
@@ -65,34 +30,34 @@ const generateTypes = async (inputFile, outputFile) => {
     const abstractSql = generateAbstractSqlModel(lfModel);
     const { abstractSqlToTypescriptTypes } = await import('@balena/abstract-sql-to-typescript/generate');
     const types = abstractSqlToTypescriptTypes(abstractSql);
-    (0, utils_1.writeAll)(types, outputFile);
+    writeAll(types, outputFile);
 };
-commander_1.program
-    .version(utils_1.version)
+program
+    .version(version)
     .option('-e, --engine <engine>', 'The target database engine (postgres|websql|mysql), default: postgres', /postgres|websql|mysql/, 'postgres');
-commander_1.program
+program
     .command('parse <input-file> [output-file]')
     .description('parse the input SBVR file into LF')
     .action(parse);
-commander_1.program
+program
     .command('transform <input-file> [output-file]')
     .description('transform the input SBVR file into abstract SQL')
     .action(transform);
-commander_1.program
+program
     .command('compile <input-file> [output-file]')
     .description('compile the input SBVR file into SQL')
     .action(runCompile);
-commander_1.program
+program
     .command('generate-types <input-file> [output-file]')
     .description('generate typescript types from the input SBVR')
     .action(generateTypes);
-commander_1.program
+program
     .command('help')
     .description('print the help')
-    .action(() => commander_1.program.help());
-commander_1.program.arguments('<input-file> [output-file]').action(runCompile);
+    .action(() => program.help());
+program.arguments('<input-file> [output-file]').action(runCompile);
 if (process.argv.length === 2) {
-    commander_1.program.help();
+    program.help();
 }
-void commander_1.program.parseAsync(process.argv);
+void program.parseAsync(process.argv);
 //# sourceMappingURL=sbvr-compiler.js.map

package/out/bin/sbvr-compiler.js.map

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

package/out/bin/utils.d.ts

@@ -1,7 +1,7 @@
 import type { SqlModel } from '@balena/abstract-sql-compiler';
 import type { AbstractSqlModel } from '@balena/abstract-sql-compiler';
-import '../server-glue/sbvr-loader';
-export { version } from '../config-loader/env';
+import '../server-glue/sbvr-loader.js';
+export { version } from '../config-loader/env.js';
 export declare const writeAll: (output: string, outputFile?: string) => void;
 export declare const writeSqlModel: (sqlModel: SqlModel, outputFile?: string) => void;
-export declare const getAbstractSqlModelFromFile: (modelFile: string, modelName: string | undefined) => AbstractSqlModel;
+export declare const getAbstractSqlModelFromFile: (modelFile: string, modelName: string | undefined) => Promise<AbstractSqlModel>;

package/out/bin/utils.js

@@ -1,47 +1,13 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbstractSqlModelFromFile = exports.writeSqlModel = exports.writeAll = exports.version = void 0;
 process.env.PINEJS_CACHE_FILE =
-    process.env.PINEJS_CACHE_FILE || __dirname + '/.pinejs-cache.json';
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-require("../server-glue/sbvr-loader");
-var env_1 = require("../config-loader/env");
-Object.defineProperty(exports, "version", { enumerable: true, get: function () { return env_1.version; } });
-const writeAll = (output, outputFile) => {
+    process.env.PINEJS_CACHE_FILE ||
+        fileURLToPath(new URL('.pinejs-cache.json', import.meta.url));
+import fs from 'fs';
+import path from 'path';
+import '../server-glue/sbvr-loader.js';
+import { fileURLToPath } from 'url';
+import { loadSBVR } from '../server-glue/sbvr-loader.js';
+export { version } from '../config-loader/env.js';
+export const writeAll = (output, outputFile) => {
     if (outputFile) {
         fs.writeFileSync(outputFile, output);
     }
@@ -49,8 +15,7 @@ const writeAll = (output, outputFile) => {
         console.log(output);
     }
 };
-exports.writeAll = writeAll;
-const writeSqlModel = (sqlModel, outputFile) => {
+export const writeSqlModel = (sqlModel, outputFile) => {
     const output = `\
 --
 -- Create table statements
@@ -68,9 +33,8 @@ ${sqlModel.rules
 ${rule.sql}`)
         .join('\n\n')}
 `;
-    (0, exports.writeAll)(output, outputFile);
+    writeAll(output, outputFile);
 };
-exports.writeSqlModel = writeSqlModel;
 const getConfigModel = (fileContents, modelName) => {
     if ('models' in fileContents) {
         if (fileContents.models.length === 0) {
@@ -87,13 +51,13 @@ const getConfigModel = (fileContents, modelName) => {
     }
     return fileContents;
 };
-const getAbstractSqlModelFromFile = (modelFile, modelName) => {
+export const getAbstractSqlModelFromFile = async (modelFile, modelName) => {
     let fileContents;
     try {
-        fileContents = require(path.resolve(modelFile));
+        fileContents = await import(path.resolve(modelFile));
     }
     catch {
-        fileContents = fs.readFileSync(require.resolve(modelFile), 'utf8');
+        fileContents = await fs.promises.readFile(new URL(import.meta.resolve(modelFile)), 'utf8');
     }
     let seModel;
     if (fileContents == null) {
@@ -114,7 +78,7 @@ const getAbstractSqlModelFromFile = (modelFile, modelName) => {
             seModel = configModel.modelText;
         }
         else if ('modelFile' in configModel && configModel.modelFile != null) {
-            seModel = fs.readFileSync(require.resolve(configModel.modelFile), 'utf8');
+            seModel = await loadSBVR(configModel.modelFile, import.meta);
         }
         else {
             throw new Error('Unrecognized config file');
@@ -123,7 +87,7 @@ const getAbstractSqlModelFromFile = (modelFile, modelName) => {
     else {
         throw new Error('Unrecognized config file');
     }
-    const { generateLfModel, generateAbstractSqlModel } = require('../sbvr-api/sbvr-utils');
+    const { generateLfModel, generateAbstractSqlModel } = await import('../sbvr-api/sbvr-utils.js');
     let lfModel;
     try {
         lfModel = generateLfModel(seModel);
@@ -133,5 +97,4 @@ const getAbstractSqlModelFromFile = (modelFile, modelName) => {
     }
     return generateAbstractSqlModel(lfModel);
 };
-exports.getAbstractSqlModelFromFile = getAbstractSqlModelFromFile;
 //# sourceMappingURL=utils.js.map

package/out/bin/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/bin/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/bin/utils.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAC5B,OAAO,CAAC,GAAG,CAAC,iBAAiB;QAC7B,aAAa,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAM/D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,+BAA+B,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAE,UAAmB,EAAQ,EAAE;IACrE,IAAI,UAAU,EAAE,CAAC;QAChB,EAAE,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAC5B,QAAkB,EAClB,UAAmB,EACZ,EAAE;IACT,MAAM,MAAM,GAAG;;;;;EAKd,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;;;;;;EAMlC,QAAQ,CAAC,KAAK;SACd,GAAG,CACH,CAAC,IAAI,EAAE,EAAE,CAAC;KACP,IAAI,CAAC,iBAAiB;EACzB,IAAI,CAAC,GAAG,EAAE,CACV;SACA,IAAI,CAAC,MAAM,CAAC;CACb,CAAC;IACD,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CACtB,YAA+C,EAC/C,SAAkB,EACS,EAAE;IAC7B,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QAC9B,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;YACzE,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CACd,mCAAmC,SAAS,aAAa,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACjH,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,KAAK,EAC/C,SAAiB,EACjB,SAA6B,EACD,EAAE;IAC9B,IAAI,YAAwD,CAAC;IAC7D,IAAI,CAAC;QACJ,YAAY,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACR,YAAY,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CACxC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EACvC,MAAM,CACN,CAAC;IACH,CAAC;IACD,IAAI,OAAe,CAAC;IACpB,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,GAAG,YAAY,CAAC;IACxB,CAAC;SAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC7C,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;YAC9B,OAAO,YAAY,CAAC;QACrB,CAAC;QACD,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QAC5D,IAAI,aAAa,IAAI,WAAW,IAAI,WAAW,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;YACrE,OAAO,WAAW,CAAC,WAAW,CAAC;QAChC,CAAC;aAAM,IAAI,WAAW,IAAI,WAAW,IAAI,WAAW,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YACxE,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC;QACjC,CAAC;aAAM,IAAI,WAAW,IAAI,WAAW,IAAI,WAAW,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YACxE,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC7C,CAAC;IACF,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,EAAE,eAAe,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CACjE,2BAA2B,CAC3B,CAAC;IACF,IAAI,OAAO,CAAC;IACZ,IAAI,CAAC;QACJ,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACd,QAAQ,CAAC,CAAC,OAAO,8KAA8K,CAC/L,CAAC;IACH,CAAC;IACD,OAAO,wBAAwB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC,CAAC"}