Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
sanoel committed Oct 4, 2024
2 parents 038fc3b + 1b1d931 commit a7d01dc
Show file tree
Hide file tree
Showing 18 changed files with 1,625 additions and 1,341 deletions.
6 changes: 4 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
dist
lib
coverage
bundle.*
.test
coverage
.pnp.*
.yarn
32 changes: 17 additions & 15 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
root: true

extends:
- 'plugin:@typescript-eslint/recommended'
- plugin:@typescript-eslint/recommended
- plugin:node/recommended
- plugin:github/recommended
- plugin:promise/recommended
Expand All @@ -11,10 +11,10 @@ extends:
- plugin:import/recommended
- plugin:unicorn/recommended
#- plugin:security/recommended
- plugin:sonarjs/recommended
#- plugin:sonarjs/recommended
- plugin:ava/recommended
- xo
- prettier
- plugin:prettier/recommended

plugins:
- '@typescript-eslint'
Expand All @@ -37,24 +37,24 @@ parser: '@typescript-eslint/parser'

parserOptions:
ecmaVersion: 2020
project: './tsconfig.*'
project: ./tsconfig*.json

overrides:
- files: '*.{c,m,}ts'
- files: '*.ts'
extends:
- plugin:github/typescript
- plugin:import/typescript
- xo-typescript
- prettier
- plugin:prettier/recommended
parserOptions:
ecmaVersion: 2020
project: './tsconfig.*'
project: ./tsconfig*.json
rules:
prettier/prettier: off
'@typescript-eslint/naming-convention':
[
error,
{ selector: default, format: [camelCase] },
{ selector: default, modifiers: [static], format: [PascalCase] },
{ selector: import, modifiers: [default], format: null },
{ selector: objectLiteralProperty, format: null },
{ selector: enumMember, format: [PascalCase] },
Expand All @@ -80,31 +80,30 @@ overrides:
},

{ selector: typeLike, format: [PascalCase] },

{ selector: parameter, modifiers: [destructured], format: null },
]
'@typescript-eslint/restrict-template-expressions': off
'@typescript-eslint/restrict-template-expressions': 0
'@typescript-eslint/no-shadow': warn
'@typescript-eslint/no-unused-vars':
[
warn,
{
args: after-used,
ignoreRestSiblings: true,
varsIgnorePattern: '^_',
argsIgnorePattern: '^_',
varsIgnorePattern: ^_,
argsIgnorePattern: ^_,
},
]
'@typescript-eslint/consistent-type-definitions': [warn, interface]
'@typescript-eslint/switch-exhaustiveness-check': off

rules:
prettier/prettier: off
notice/notice:
- error
- template: |
/**
* @license
* Copyright <%= YEAR %> Open Ag Data Alliance
* Copyright <%= YEAR %> Qlever LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -120,6 +119,7 @@ rules:
*/
onNonMatchingHeader: append
nonMatchingTolerance: 0.7
'@typescript-eslint/no-shadow': [warn, { allow: [_] }]
sonarjs/no-duplicate-string: [warn, { threshold: 5 }]
sonarjs/cognitive-complexity: warn
eslint-comments/no-unused-disable: off
Expand All @@ -132,6 +132,7 @@ rules:
eslint-comments/no-use: off
no-secrets/no-secrets: [error, { tolerance: 5 }]
no-empty-label: off
no-return-await: 0
no-warning-comments: 0
node/no-missing-import: off
import/no-unresolved: off
Expand All @@ -144,11 +145,12 @@ rules:
res: false
err: false
doc: false
docs: false
no-constructor-bind/no-constructor-bind: error
no-constructor-bind/no-constructor-state: error
sort-imports: [warn, { allowSeparatedGroups: true }]
ava/no-ignored-test-files: off
ava/no-import-test-files: off
ava/no-skip-test: warn
ava/no-skip-assert: warn
'@typescript-eslint/switch-exhaustiveness-check': off
ava/use-test: off
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
- package-ecosystem: github-actions
directory: /
schedule:
interval: 'daily'
interval: daily
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: 'CodeQL'
name: CodeQL

on:
push:
Expand All @@ -18,7 +18,7 @@ on:
# The branches below must be a subset of the branches above
branches: [master]
schedule:
- cron: '25 20 * * 4'
- cron: 25 20 * * 4

jobs:
analyze:
Expand All @@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: ['javascript']
language: [javascript]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
Expand Down
19 changes: 13 additions & 6 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
# Ignore compiled TS output
dist

bundle.*
.test
coverage
node_modules
yarn-cache
services-available

LICENSE

yarn.lock
tags*
.history
.vim
.dccache

**/yarn.lock
**/yarn-error.log
**/.yarn/*
**/.pnp.*

.yarn
.pnp.*
act
5 changes: 5 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"singleQuote": true,
"quoteProps": "consistent",
"overrides": [{ "files": ".yarnrc.yml", "options": { "singleQuote": false } }]
}
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.1.1.cjs

This file was deleted.

894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ compressionLevel: mixed

enableGlobalCache: false

yarnPath: .yarn/releases/yarn-4.1.1.cjs
yarnPath: .yarn/releases/yarn-4.3.1.cjs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const watch = new ListWatch({
name: /* string; key name of the oada-list-lib entry in the _meta doc*/,
resume: /* boolean; whether to track changes using a _meta/oada-list-lib/<name> entry */,
onNewList: /* AssumeState.New || AssumeState.Handled; Whether or not to handle existing
list items on startup. `New` means it will treat the list as new every time
list items on startup. `New` means it will treat the list as new every time
it starts up and will attempt to process each item; `Handled` means it will
not process existing items. */,
})
Expand Down
68 changes: 32 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@oada/list-lib",
"version": "5.1.0",
"version": "6.1.0",
"description": "Library for processing items in an OADA list",
"main": "dist/index.js",
"type": "module",
"engines": {
"node": ">=16.0.0"
"node": ">=18.0.0"
},
"repository": {
"type": "git",
Expand All @@ -32,10 +32,6 @@
"dist/**/*",
"tsconfig.json"
],
"prettier": {
"singleQuote": true,
"quoteProps": "consistent"
},
"ava": {
"failFast": false,
"files": [
Expand Down Expand Up @@ -65,61 +61,61 @@
]
},
"devDependencies": {
"@ava/typescript": "^4.1.0",
"@oada/client": "^5.0.1",
"@tsconfig/node16": "^16.1.1",
"@ava/typescript": "^5.0.0",
"@oada/client": "^5.1.0",
"@tsconfig/node18": "^18.2.4",
"@types/debug": "^4.1.12",
"@types/node": "^16.18.80",
"@types/node": "^18.19.39",
"@types/object-assign-deep": "^0.4.3",
"@types/sinon": "^17.0.3",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@yarnpkg/sdks": "^3.1.0",
"ava": "6.1.1",
"c8": "^9.1.0",
"eslint": "^8.56.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"@yarnpkg/sdks": "^3.1.3",
"ava": "6.1.3",
"c8": "^10.1.2",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-xo": "^0.44.0",
"eslint-config-xo-typescript": "^2.0.0",
"eslint-config-xo": "^0.45.0",
"eslint-config-xo-typescript": "^4.0.0",
"eslint-formatter-pretty": "^6.0.1",
"eslint-import-resolver-node": "^0.3.9",
"eslint-plugin-array-func": "^5.0.1",
"eslint-plugin-ava": "^14.0.0",
"eslint-plugin-ava": "^15.0.1",
"eslint-plugin-escompat": "^3.4.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-filenames": "^1.3.2",
"eslint-plugin-github": "^4.10.1",
"eslint-plugin-github": "^5.0.1",
"eslint-plugin-i18n-text": "^1.0.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-no-constructor-bind": "^2.0.4",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-no-secrets": "^0.8.9",
"eslint-plugin-no-secrets": "^1.0.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-notice": "^0.9.10",
"eslint-plugin-notice": "^1.0.0",
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-regexp": "^2.2.0",
"eslint-plugin-security": "^2.1.0",
"eslint-plugin-sonarjs": "^0.24.0",
"eslint-plugin-unicorn": "^51.0.1",
"prettier": "^3.2.5",
"sinon": "^17.0.1",
"eslint-plugin-promise": "^6.2.0",
"eslint-plugin-regexp": "^2.6.0",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-sonarjs": "^1.0.3",
"eslint-plugin-unicorn": "^54.0.0",
"prettier": "^3.3.2",
"sinon": "^18.0.0",
"ts-node": "^10.9.2",
"typescript": "5.3.3"
"typescript": "5.5.2"
},
"dependencies": {
"@oada/pino-debug": "^4.0.1",
"@oada/types": "^3.5.3",
"abort-controller": "^3.0.0",
"debug": "^4.3.4",
"debug": "^4.3.5",
"eventemitter3": "^5.0.1",
"isomorphic-timers-promises": "^1.0.1",
"json-ptr": "^3.1.1",
"jsonpath-plus": "^8.0.0",
"jsonpath-plus": "^9.0.0",
"object-assign-deep": "^0.4.0",
"tslib": "^2.6.2",
"xksuid": "https://github.com/g12i/xksuid.git#fix-crypto-polyfill"
"tslib": "^2.6.3",
"xksuid": "https://github.com/g12i/xksuid.git#commit=22a21eb01331191feb62ea0a4e67d96d2e80f396"
},
"peerDependencies": {
"@oada/client": "^5.0.0"
Expand All @@ -129,9 +125,9 @@
"optional": true
}
},
"packageManager": "yarn@4.1.1",
"packageManager": "yarn@4.3.1",
"volta": {
"node": "20.11.0"
"node": "20.15.0"
},
"resolutions": {
"xksuid": "https://github.com/g12i/xksuid.git#fix-crypto-polyfill"
Expand Down
Loading

0 comments on commit a7d01dc

Please sign in to comment.