@balena/pinejs 19.7.2-build-esm-36f468424324d7ef7578ae401fc681c9f8f63e03-3 → 19.7.2

package/src/tasks/index.ts

@@ -1,20 +1,20 @@
 import type { Schema } from 'ajv';
-import cronParser from 'cron-parser';
-import { tasks as tasksEnv } from '../config-loader/env.js';
-import { addPureHook } from '../sbvr-api/hooks.js';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
-import type { ConfigLoader } from '../server-glue/module.js';
-import { ajv, apiRoot } from './common.js';
-import type { TaskHandler } from './worker.js';
-import { Worker } from './worker.js';
-import type TasksModel from './tasks.js';
-import type { Task } from './tasks.js';
+import * as cronParser from 'cron-parser';
+import { tasks as tasksEnv } from '../config-loader/env';
+import { addPureHook } from '../sbvr-api/hooks';
+import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import type { ConfigLoader } from '../server-glue/module';
+import { ajv, apiRoot } from './common';
+import type { TaskHandler } from './worker';
+import { Worker } from './worker';
+import type TasksModel from './tasks';
+import type { Task } from './tasks';
 import type { FromSchema } from 'json-schema-to-ts';
-import { importSBVR } from '../server-glue/sbvr-loader.js';
+import { requireSBVR } from '../server-glue/sbvr-loader';
 
-export type * from './tasks.js';
+export type * from './tasks';
 
-const modelText = await importSBVR('./tasks.sbvr', import.meta);
+const modelText = requireSBVR('./tasks.sbvr', require);
 
 // Create index for polling tasks table
 const initSql = `
@@ -25,7 +25,7 @@ CREATE INDEX IF NOT EXISTS idx_task_poll ON task USING btree (
 ) WHERE status = 'queued';
 `;
 
-declare module '../sbvr-api/sbvr-utils.js' {
+declare module '../sbvr-api/sbvr-utils' {
 	export interface API {
 		[apiRoot]: PinejsClient<TasksModel>;
 	}

package/src/tasks/worker.ts

@@ -1,14 +1,14 @@
 import type { ValidateFunction } from 'ajv';
 import { setTimeout } from 'node:timers/promises';
 import type { AnyObject } from 'pinejs-client-core';
-import { tasks as tasksEnv } from '../config-loader/env.js';
-import type * as Db from '../database-layer/db.js';
-import * as permissions from '../sbvr-api/permissions.js';
-import { PinejsClient } from '../sbvr-api/sbvr-utils.js';
-import { sbvrUtils } from '../server-glue/module.js';
-import { ajv } from './common.js';
-import type { Task } from './tasks.js';
-import type TasksModel from './tasks.js';
+import { tasks as tasksEnv } from '../config-loader/env';
+import type * as Db from '../database-layer/db';
+import * as permissions from '../sbvr-api/permissions';
+import { PinejsClient } from '../sbvr-api/sbvr-utils';
+import { sbvrUtils } from '../server-glue/module';
+import { ajv } from './common';
+import type { Task } from './tasks';
+import type TasksModel from './tasks';
 
 interface TaskArgs<T = AnyObject> {
 	api: PinejsClient;

package/src/webresource-handler/handlers/NoopHandler.ts

@@ -1,9 +1,5 @@
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
-import type {
-	IncomingFile,
-	UploadResponse,
-	WebResourceHandler,
-} from '../index.js';
+import type { IncomingFile, UploadResponse, WebResourceHandler } from '..';
 
 export class NoopHandler implements WebResourceHandler {
 	public async handleFile(resource: IncomingFile): Promise<UploadResponse> {

package/src/webresource-handler/handlers/S3Handler.ts

@@ -5,7 +5,7 @@ import {
 	type UploadResponse,
 	WebResourceError,
 	type WebResourceHandler,
-} from '../index.js';
+} from '..';
 import {
 	S3Client,
 	type S3ClientConfig,

package/src/webresource-handler/handlers/index.ts

@@ -1,2 +1,2 @@
-export * from './NoopHandler.js';
-export * from './S3Handler.js';
+export * from './NoopHandler';
+export * from './S3Handler';

package/src/webresource-handler/index.ts

@@ -1,21 +1,21 @@
-import type Express from 'express';
+import type * as Express from 'express';
 import busboy from 'busboy';
-import type stream from 'node:stream';
-import * as uriParser from '../sbvr-api/uri-parser.js';
-import * as sbvrUtils from '../sbvr-api/sbvr-utils.js';
-import type { HookArgs } from '../sbvr-api/hooks.js';
-import { getApiRoot, getModel } from '../sbvr-api/sbvr-utils.js';
-import { checkPermissions } from '../sbvr-api/permissions.js';
-import { NoopHandler } from './handlers/NoopHandler.js';
+import type * as stream from 'node:stream';
+import * as uriParser from '../sbvr-api/uri-parser';
+import * as sbvrUtils from '../sbvr-api/sbvr-utils';
+import type { HookArgs } from '../sbvr-api/hooks';
+import { getApiRoot, getModel } from '../sbvr-api/sbvr-utils';
+import { checkPermissions } from '../sbvr-api/permissions';
+import { NoopHandler } from './handlers/NoopHandler';
 import {
 	odataNameToSqlName,
 	sqlNameToODataName,
 } from '@balena/odata-to-abstract-sql';
-import { errors, permissions } from '../server-glue/module.js';
+import { errors, permissions } from '../server-glue/module';
 import type { WebResourceType as WebResource } from '@balena/sbvr-types';
 import { TypedError } from 'typed-error';
 
-export * from './handlers/index.js';
+export * from './handlers';
 
 export interface IncomingFile {
 	fieldname: string;

package/tsconfig.dev.json

@@ -1,15 +1,13 @@
 {
 	"extends": "./tsconfig.json",
 	"compilerOptions": {
-		"rootDir": ".",
-		"allowImportingTsExtensions": true
+		"rootDir": "."
 	},
 	"include": [
 		"build/**/*",
-		"bin/**/*",
 		"src/**/*",
 		"test/**/*",
 		"typings/**/*.d.ts",
-		"Gruntfile.cts"
+		"Gruntfile.ts"
 	]
 }

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
 	"compilerOptions": {
-		"module": "NodeNext",
+		"module": "Node16",
 		"strict": true,
 		"strictFunctionTypes": false,
 		"noImplicitThis": false,

package/typings/lf-to-abstract-sql.d.ts

@@ -5,7 +5,7 @@ declare module '@balena/lf-to-abstract-sql' {
 	export const LF2AbstractSQL: {
 		createInstance: () => {
 			match: (lfModel: LFModel, rule: 'Process') => AbstractSqlModel;
-			addTypes: (types: typeof sbvrTypes.default) => void;
+			addTypes: (types: typeof sbvrTypes) => void;
 			reset: () => void;
 		};
 	};
@@ -14,6 +14,6 @@ declare module '@balena/lf-to-abstract-sql' {
 		_extend(obj: object): typeof LF2AbstractSQLPrep;
 	};
 	export const createTranslator: (
-		types: typeof sbvrTypes.default,
+		types: typeof sbvrTypes,
 	) => (lfModel: LFModel, rule: 'Process') => AbstractSqlModel;
 }

package/typings/memoizee.d.ts

@@ -1,5 +1,5 @@
-declare module 'memoizee/weak.js' {
-	import type Memoize from 'memoizee';
+declare module 'memoizee/weak' {
+	import type * as Memoize from 'memoizee';
 
 	type FirstArg<T> = T extends (arg1: infer U) => any ? U : any;
 	type RestArgs<T> = T extends (arg1: any, ...args: infer U) => any ? U : any[];