fix: fix types for lib-prom

OADA · Nov 18, 2024 · bb3ef00 · bb3ef00
1 parent 317be12
commit bb3ef00
Show file tree

Hide file tree

Showing 42 changed files with 1,279 additions and 1,298 deletions.
diff --git a/oada/.yarn/releases/yarn-4.5.0.cjs → oada/.yarn/releases/yarn-4.5.1.cjs b/oada/.yarn/releases/yarn-4.5.0.cjs → oada/.yarn/releases/yarn-4.5.1.cjs
diff --git a/oada/.yarnrc.yml b/oada/.yarnrc.yml
@@ -61,4 +61,4 @@ packageExtensions:
     peerDependencies:
       oauth2orize: "*"
 
-yarnPath: .yarn/releases/yarn-4.5.0.cjs
+yarnPath: .yarn/releases/yarn-4.5.1.cjs
diff --git a/oada/eslint.config.mjs b/oada/eslint.config.mjs
@@ -35,14 +35,12 @@ import noSecrets from 'eslint-plugin-no-secrets';
 import node from 'eslint-plugin-n';
 import notice from 'eslint-plugin-notice';
 import optimizeRegex from 'eslint-plugin-optimize-regex';
-import prettier from 'eslint-config-prettier';
 import promise from 'eslint-plugin-promise';
 import regexp from 'eslint-plugin-regexp';
 import security from 'eslint-plugin-security';
 import sonarjs from 'eslint-plugin-sonarjs';
 import unicorn from 'eslint-plugin-unicorn';
-import xo from 'eslint-config-xo';
-import xoTypescript from 'eslint-config-xo-typescript';
+import xoTypescript from 'eslint-config-xo-typescript/space';
 
 const __filename = fileURLToPath(import.meta.url);
 
@@ -57,36 +55,33 @@ const compat = new FlatCompat({
 
 export default typescript.config(
   js.configs.recommended,
-  ...typescript.configs.recommended,
-  ...typescript.configs.recommendedTypeChecked,
   node.configs['flat/recommended'],
   security.configs.recommended,
   sonarjs.configs.recommended,
   unicorn.configs['flat/recommended'],
   regexp.configs['flat/recommended'],
+  promise.configs['flat/recommended'],
+  ...xoTypescript,
   ...fixupConfigRules(
     compat.extends(
-      // 'plugin:github/recommended',
-      'plugin:promise/recommended',
+      'plugin:github/recommended',
+      'plugin:github/typescript',
       'plugin:optimize-regex/recommended',
       'plugin:import/recommended',
       'plugin:ava/recommended',
     ),
-    ...xo,
   ),
   {
     files: ['**/*.{c,m,}ts'],
     extends: [
       ...fixupConfigRules(
         compat.extends(
-          // 'plugin:github/typescript',
+           //'plugin:github/typescript',
           'plugin:import/typescript',
         ),
-        ...xoTypescript,
       ),
     ],
   },
-  prettier,
   {
     ignores: [
       '**/__virtual__/',
@@ -104,7 +99,6 @@ export default typescript.config(
   {
     plugins: {
       // 'github': fixupPluginRules(github),
-      'promise': fixupPluginRules(promise),
       'optimize-regex': fixupPluginRules(optimizeRegex),
       'no-constructor-bind': noConstructorBind,
       'import': fixupPluginRules(_import),

diff --git a/oada/libs/lib-arangodb/package.json b/oada/libs/lib-arangodb/package.json
@@ -65,7 +65,7 @@
     "deep-equal": "^2.2.3",
     "flat": "^6.0.1",
     "json-ptr": "^3.1.1",
-    "tslib": "2.7.0"
+    "tslib": "2.8.1"
   },
   "devDependencies": {
     "@ava/typescript": "^5.0.0",
@@ -75,9 +75,9 @@
     "@types/deep-equal": "^1.0.4",
     "@types/flat": "^5.0.5",
     "@types/json-pointer": "^1.0.34",
-    "@types/node": "^22.7.5",
-    "ava": "6.1.3",
-    "type-fest": "^4.26.1"
+    "@types/node": "^22.9.0",
+    "ava": "6.2.0",
+    "type-fest": "^4.27.0"
   },
   "volta": {
     "node": "22.5.1"

diff --git a/oada/libs/lib-arangodb/src/config.ts b/oada/libs/lib-arangodb/src/config.ts
@@ -42,13 +42,15 @@ export interface Graph {
  * @todo actually validate format?
  */
 
+// eslint-disable-next-line sonarjs/no-empty-function
 export function collection(_value: unknown): asserts _value is Collection {}
 
 export const { config, schema } = await libConfig({
   arangodbImport: {
     connectionString: {
       doc: 'URI for connecting to arangodb',
       format: 'url',
+      // eslint-disable-next-line sonarjs/no-clear-text-protocols
       default: 'http://arangodb:8529',
       env: 'ARANGODB_IMPORT_URL',
       arg: 'arangodb-import-url',
@@ -102,6 +104,7 @@ export const { config, schema } = await libConfig({
     connectionString: {
       doc: 'URI for connecting to arangodb',
       format: 'url',
+      // eslint-disable-next-line sonarjs/no-clear-text-protocols
       default: 'http://arangodb:8529',
       env: 'ARANGODB_URL',
     },

diff --git a/oada/libs/lib-arangodb/src/db.ts b/oada/libs/lib-arangodb/src/db.ts
@@ -44,6 +44,7 @@ class DatabaseWrapper extends Database {
     let tries = 0;
     while (++tries) {
       try {
+        // eslint-disable-next-line no-await-in-loop
         const res = await super.query<T>(query, { profile, ...options });
         if (trace.enabled) {
           const { query: aql, ...rest } = query;
@@ -64,6 +65,7 @@ class DatabaseWrapper extends Database {
             `Retrying query due to deadlock (retry #${tries})`,
           );
 
+          // eslint-disable-next-line no-await-in-loop
           await setTimeout(deadlockDelay);
           continue;
         }

diff --git a/oada/libs/lib-arangodb/src/libs/exampledocs/users.ts b/oada/libs/lib-arangodb/src/libs/exampledocs/users.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+/* eslint-disable sonarjs/no-hardcoded-credentials */
+
 import type { User } from '../users.js';
 
 export default [

diff --git a/oada/libs/lib-arangodb/src/util.ts b/oada/libs/lib-arangodb/src/util.ts
@@ -17,7 +17,7 @@
 
 import { type Except } from 'type-fest';
 
-export type Selector<T> = T extends { _id?: infer I | undefined }
+export type Selector<T> = T extends { _id?: infer I }
   ? I | { _id: I }
   : never;
 

diff --git a/oada/libs/lib-arangodb/test/resources.test.ts b/oada/libs/lib-arangodb/test/resources.test.ts
@@ -31,6 +31,7 @@ test('should find parents based on resource id', async (t) => {
   const p = await resources.getParents('/resources:default:resources_rock_123');
   t.plan(3);
 
+  // eslint-disable-next-line no-unreachable-loop
   for await (const parent of p) {
     t.is(parent.path, '/rocks-index/90j2klfdjss');
     t.is(parent.resource_id, 'resources/default:resources_rocks_123');

diff --git a/oada/libs/lib-config/package.json b/oada/libs/lib-config/package.json
@@ -40,7 +40,7 @@
     "debug": "^4.3.7",
     "dotenv": "^16.4.5",
     "json5": "^2.2.3",
-    "tslib": "2.7.0",
+    "tslib": "2.8.1",
     "yaml": "^2.6.0"
   },
   "devDependencies": {

diff --git a/oada/libs/lib-kafka/package.json b/oada/libs/lib-kafka/package.json
@@ -41,16 +41,16 @@
     "eventemitter3": "^5.0.1",
     "kafkajs": "^2.2.4",
     "ksuid": "^3.0.0",
-    "tslib": "2.7.0",
-    "uuid": "^10.0.0"
+    "tslib": "2.8.1",
+    "uuid": "^11.0.3"
   },
   "devDependencies": {
     "@ava/typescript": "^5.0.0",
     "@types/convict": "^6.1.6",
     "@types/debug": "^4.1.12",
-    "@types/node": "^22.7.5",
+    "@types/node": "^22.9.0",
     "@types/uuid": "^10.0.0",
-    "ava": "6.1.3"
+    "ava": "6.2.0"
   },
   "volta": {
     "node": "22.5.1"

diff --git a/oada/libs/lib-prom/package.json b/oada/libs/lib-prom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oada/lib-prom",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "OADA Prometheus library",
   "main": "./dist/index.js",
   "type": "module",
@@ -37,14 +37,14 @@
   "dependencies": {
     "@oada/lib-config": "workspace:^",
     "prom-client": "^15.1.3",
-    "tslib": "2.7.0"
+    "tslib": "2.8.1"
   },
   "devDependencies": {
     "@ava/typescript": "^5.0.0",
     "@types/convict": "^6.1.6",
-    "@types/node": "^22.7.5",
-    "@types/ws": "^8.5.12",
-    "ava": "6.1.3",
+    "@types/node": "^22.9.0",
+    "@types/ws": "^8.5.13",
+    "ava": "6.2.0",
     "fastify-plugin": "^5.0.1"
   },
   "volta": {

diff --git a/oada/libs/lib-prom/src/index.ts b/oada/libs/lib-prom/src/index.ts
@@ -72,7 +72,7 @@ export interface PseudoMetricConfiguration<T extends string> {
   help: string;
   labels?: Record<T, string>;
   collect?: (this: PseudoMetric<T>) => void | Promise<void>;
-  registers: MetricConfiguration<T>['registers'];
+  registers?: MetricConfiguration<T>['registers'];
 }
 
 /**

diff --git a/oada/libs/models/package-lock.json b/oada/libs/models/package-lock.json
diff --git a/oada/libs/models/package.json b/oada/libs/models/package.json
@@ -30,15 +30,15 @@
   "dependencies": {
     "@oada/types": "^4.0.0",
     "@qlever-llc/interface2class": "^1.1.0",
-    "tslib": "2.7.0",
-    "type-fest": "^4.26.1",
+    "tslib": "2.8.1",
+    "type-fest": "^4.27.0",
     "xksuid": "^0.0.4"
   },
   "volta": {
     "node": "22.5.1"
   },
   "devDependencies": {
-    "@types/node": "^22.7.5",
-    "jose": "^5.9.4"
+    "@types/node": "^22.9.0",
+    "jose": "^5.9.6"
   }
 }
diff --git a/oada/libs/models/src/decorators.ts b/oada/libs/models/src/decorators.ts
@@ -40,7 +40,7 @@ export function destructure<T, R extends [...unknown[]]>(
         a.push(argument[property]);
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+       
       super(argument, ...a);
     }
   } as unknown as Class<T, [Partial<T>]>;