@etainabl/nodejs-sdk 1.2.36 → 1.2.38

package/.prettierrc

@@ -0,0 +1,11 @@
+{
+  "printWidth": 150,
+  "parser": "flow",
+  "semi": true,
+  "tabWidth": 4,
+  "useTabs": false,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "arrowParens": "avoid"
+}

package/dist/cjs/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __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;
+    };
+})();
 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);
 };

package/eslint.config.js

@@ -0,0 +1,60 @@
+import tseslint from '@typescript-eslint/eslint-plugin';
+import tsParser from '@typescript-eslint/parser';
+
+export default [
+  {
+    ignores: [
+      'node_modules/**',
+      'dist/**',
+      'coverage/**',
+      'logs/**',
+      '*.log',
+      '.DS_Store'
+    ]
+  },
+  {
+    files: ['**/*.js', '**/*.ts'],
+    plugins: {
+      '@typescript-eslint': tseslint
+    },
+    languageOptions: {
+      parser: tsParser,
+      ecmaVersion: 2020,
+      sourceType: 'module',
+      parserOptions: {
+        ecmaVersion: 2020,
+        sourceType: 'module'
+      }
+    },
+    linterOptions: {
+      reportUnusedDisableDirectives: true
+    },
+    rules: {
+      'no-console': 'off',
+      'comma-dangle': ['error', 'never'],
+      'arrow-parens': ['error', 'as-needed'],
+      'linebreak-style': 'off',
+      'padded-blocks': 'off',
+      'no-underscore-dangle': 'off',
+      'no-param-reassign': ['error', { props: false }],
+      'new-cap': ['error', { capIsNewExceptions: ['Router', 'ObjectId'] }],
+      'no-tabs': 'error',
+      'max-len': ['warn', 150],
+      'no-plusplus': 'off',
+      'generator-star-spacing': 'off',
+      'class-methods-use-this': 'off',
+      'import/extensions': 'off',
+      'import/no-unresolved': 'off',
+      'prefer-destructuring': 'off',
+      'no-use-before-define': 'off',
+      'import/prefer-default-export': 'off'
+    },
+    settings: {
+      'import/resolver': {
+        node: {
+          extensions: ['.js', '.ts']
+        }
+      }
+    }
+  }
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etainabl/nodejs-sdk",
-  "version": "1.2.36",
+  "version": "1.2.38",
   "main": "dist/cjs/index.js",
   "module": "dist/mjs/index.js",
   "types": "dist/mjs/index.d.ts",
@@ -13,7 +13,16 @@
     "winston": "^3.10.0"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.27.0",
     "@types/node": "^20.4.5",
+    "@typescript-eslint/eslint-plugin": "^8.29.0",
+    "@typescript-eslint/parser": "^8.29.0",
+    "eslint": "^9.23.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-prettier": "^10.1.1",
+    "eslint-plugin-import": "^2.31.0",
+    "prettier-eslint": "^16.3.0",
     "vitest": "^2.1.1"
   },
   "scripts": {

package/src/types/{account.d.ts → account.ts}

@@ -1,5 +1,5 @@
-import type { Portal } from './portal.ts';
-import type { StatusHistory } from './statusHistory.ts'
+import type { Portal } from './portal.js';
+import type { StatusHistory } from './statusHistory.js'
 
 interface PortalAccountSchema extends Portal{
   invoiceFilenames: any[]; 

package/src/types/{asset.d.ts → asset.ts}

@@ -1,5 +1,5 @@
 import type { Address } from './address.js'
-import type { StatusHistory } from './statusHistory.ts'
+import type { StatusHistory } from './statusHistory.js'
 
 // Define the Image Schema
 interface Image {

package/src/types/{automation.d.ts → automation.ts}

@@ -1,5 +1,3 @@
-import { Types } from 'mongoose';
-
 interface Log {
   message: string;
   timestamp: Date;
@@ -29,8 +27,8 @@ export interface Automation {
   data: Record<string, any>;
   sourceData: Record<string, any>;
   frequency?: FrequencyType;
-  accountIds?: Types.ObjectId[];
-  assetIds?: Types.ObjectId[];
+  accountIds?: string[];
+  assetIds?: string[];
   userSub: string;
-  companyId: Types.ObjectId;
+  companyId: string;
 }

package/src/types/{company.d.ts → company.ts}

@@ -1,6 +1,6 @@
 
 import { Address } from './address.js'
-import { Portal } from './portal.ts'
+import { Portal } from './portal.js'
 
 interface SupplierPortals {
   supplierId: string;

package/src/types/{dataIngest.d.ts → dataIngest.ts}

@@ -1,8 +1,7 @@
 export interface DataIngest {
     messageId: string;
     status: 'started' | 'processing' | 'importing' | 'completed' | 'failed' | 'dlq'
-    context: string
+    context: any;
     startTime: string;
     remainingTime: number;
-    context: {}
 }

package/src/types/{entity.d.ts → entity.ts}

@@ -1,18 +1,17 @@
-import { Types } from 'mongoose';
-import { Address} from './address.ts';
+import { Address } from './address.js';
 
 type EntityType = 'fund' | 'company' | 'charity' | 'school/university' | 'council' | 'other';
 
 export interface Entity {
-  _id?: Types.ObjectId;
+  _id?: string;
   legalName: string;
   type: EntityType;
   companyNumber?: string;
   companyLogo?: string;
   billingAddress: Address;
-  parentEntityId?: Types.ObjectId;
-  ultimateParentEntityId?: Types.ObjectId;
-  companyId: Types.ObjectId;
+  parentEntityId?: string;
+  ultimateParentEntityId?: string;
+  companyId: string;
   batchId?: string;
   userSub: string;
 }

package/src/types/index.ts

@@ -1,33 +1,16 @@
-import type { Account } from './account.js'
-import type { Asset } from './asset.js'
-import type { Automation } from './automation.js'
-import type { Company } from './company.js'
-import type { CreateScraperRunParams, ScraperRun } from './scraperRun.js';
-import type { DataIngest } from './dataIngest.js'
-import type { Entity } from './entity.js'
-import type { Email } from './email.js';
-import type { Invoice } from './invoice.js';
-import type { Log } from './log.js';
-import type { Reading } from './reading.js'
-import type { Report } from './report.js'
-import type { Supplier } from './supplier.js'
-
-export type {
-  Account,
-  Asset, 
-  Automation,
-  Company,
-  CreateScraperRunParams,
-  DataIngest,
-  Email,
-  Entity,
-  Invoice,
-  Log,
-  Reading,
-  Report,
-  ScraperRun,
-  Supplier
-};
+export type { Account } from './account.js'
+export type { Asset } from './asset.js'
+export type { Automation } from './automation.js'
+export type { Company } from './company.js'
+export type { CreateScraperRunParams, ScraperRun } from './scraperRun.js';
+export type { DataIngest } from './dataIngest.js'
+export type { Entity } from './entity.js'
+export type { Email } from './email.js';
+export type { Invoice } from './invoice.js';
+export type { Log } from './log.js';
+export type { Reading } from './reading.js'
+export type { Report } from './report.js'
+export type { Supplier } from './supplier.js'
 
 export interface ETNPagedResponse<T = any> {
   data: T[];

package/src/types/{invoice.d.ts → invoice.ts}

@@ -1,5 +1,3 @@
-import { Types } from 'mongoose';
-
 interface Values {
   friendlyInvoiceNumber?: string;
   friendlySupplierRef?: string;
@@ -61,9 +59,23 @@ interface Values {
   endRead?: string;
 }
 
+interface Rate {
+  consumption?: string;
+  cost?: string;
+  endDate?: Date | null;
+  endRead?: string | null;
+  endReadType?: string | null;
+  rateName?: string | null;
+  startDate?: Date | null;
+  startRead?: string | null;
+  startReadType?: string | null;
+  type: RateType | null;
+  unitRate?: string | null;
+}
+
 type InvoiceStatus = 'processing' | 'pending' | 'uploading' | 'queued' | 'captured' | 'error' | 'completed';
 type FinancialStatus = 'approved' | 'new' | 'not-approved' | 'paid' | 'sent-for-payment';
-
+type RateType = 'unitRate' | 'daily' | 'levy' | 'tax' | 'kva' | 'waterRate' | 'wasteRate' | 'discount'
 export interface Invoice {
   jobId?: string | null;
   startTime?: Date;
@@ -79,7 +91,7 @@ export interface Invoice {
   tags?: string[];
   manualResults?: Record<string, any>;
   values?: Values;
-  rates?: any[];
+  rates?: Rate[];
   detailedResults?: Record<string, any>;
   templateVersion?: string | null;
   error?: Record<string, any>;
@@ -95,12 +107,12 @@ export interface Invoice {
   scraperInvoiceId?: string;
   confirmedAt?: Date | null;
   confirmedBy?: string | null;
-  supplierId?: Types.ObjectId | null;
+  supplierId?: string | null;
   sisterId?: string | null;
   batchId?: string | null;
-  accountId?: Types.ObjectId | null;
-  entityId?: Types.ObjectId;
-  companyId: Types.ObjectId;
+  accountId?: string | null;
+  entityId?: string;
+  companyId: string;
   userSub: string;
   validation?: any[];
 }

package/.eslintrc.js

@@ -1,29 +0,0 @@
-module.exports = {
-  extends: ['airbnb-base'],
-  parser: '@typescript-eslint/parser',
-  rules: {
-    'no-console': 'off',
-    'comma-dangle': [2, 'never'],
-    'arrow-parens': [2, 'as-needed'],
-    'linebreak-style': 0,
-    'padded-blocks': 0,
-    'no-underscore-dangle': [0],
-    'no-param-reassign': [2, { props: false }],
-    'new-cap': [2, { capIsNewExceptions: ['Router', 'ObjectId'] }],
-    'no-tabs': 2,
-    'max-len': [1, 150],
-    'no-plusplus': 0,
-    'generator-star-spacing': 0,
-    'class-methods-use-this': 0,
-    'import/extensions': 0,
-    'import/no-unresolved': 0,
-    'prefer-destructuring': 0,
-    'no-use-before-define': 0,
-    'import/prefer-default-export': 'off'
-  },
-  env: {
-    node: true,
-    browser: true
-  },
-  parserOptions: { ecmaVersion: 2020 }
-};