From a17b92fa2dda7501db1a125893f62290e4e33b36 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 15 Nov 2024 08:16:11 -0700 Subject: [PATCH 001/417] Scaffolded new CI/CD pipeline --- .../get-artifact-for-stage-tests/action.yml | 82 ++ .../actions/setup-docker-on-macos/action.yml | 17 + .github/actions/update-version/action.yml | 13 + .github/workflows/build-artifacts.yml | 105 +++ .github/workflows/build-bindings.yml | 812 ++++++------------ .../bump-stage-and-upload-to-jfrog.yml | 67 ++ .github/workflows/bump-version.yml | 84 ++ .github/workflows/delete-artifacts.yml | 11 + .github/workflows/dev-to-stage.yml | 60 ++ .github/workflows/dev-workflow-p1.yml | 37 + .github/workflows/dev-workflow-p2.yml | 43 + .github/workflows/fast-forward-merge.yml | 43 + .github/workflows/stage-tests.yml | 208 +++++ .github/workflows/test-server-rc.yml | 170 ++++ .github/workflows/update-version.yml | 64 ++ .github/workflows/upload-to-jfrog.yml | 52 ++ .../actions/run-ee-server/action.yml | 62 ++ .../assets/aerospike.conf | 0 .github_former/workflows/build-bindings.yml | 599 +++++++++++++ .../workflows/codeql.yml | 0 .../workflows/combine-bindings/action.yml | 0 .../workflows/tests.yml | 0 .../workflows/windows-build.yml | 0 23 files changed, 2003 insertions(+), 526 deletions(-) create mode 100644 .github/actions/get-artifact-for-stage-tests/action.yml create mode 100644 .github/actions/setup-docker-on-macos/action.yml create mode 100644 .github/actions/update-version/action.yml create mode 100644 .github/workflows/build-artifacts.yml create mode 100644 .github/workflows/bump-stage-and-upload-to-jfrog.yml create mode 100644 .github/workflows/bump-version.yml create mode 100644 .github/workflows/delete-artifacts.yml create mode 100644 .github/workflows/dev-to-stage.yml create mode 100644 .github/workflows/dev-workflow-p1.yml create mode 100644 .github/workflows/dev-workflow-p2.yml create mode 100644 .github/workflows/fast-forward-merge.yml create mode 100644 .github/workflows/stage-tests.yml create mode 100644 .github/workflows/test-server-rc.yml create mode 100644 .github/workflows/update-version.yml create mode 100644 .github/workflows/upload-to-jfrog.yml create mode 100644 .github_former/actions/run-ee-server/action.yml rename {.github => .github_former}/assets/aerospike.conf (100%) create mode 100644 .github_former/workflows/build-bindings.yml rename {.github => .github_former}/workflows/codeql.yml (100%) rename {.github => .github_former}/workflows/combine-bindings/action.yml (100%) rename {.github => .github_former}/workflows/tests.yml (100%) rename {.github => .github_former}/workflows/windows-build.yml (100%) diff --git a/.github/actions/get-artifact-for-stage-tests/action.yml b/.github/actions/get-artifact-for-stage-tests/action.yml new file mode 100644 index 000000000..8b91fa5ea --- /dev/null +++ b/.github/actions/get-artifact-for-stage-tests/action.yml @@ -0,0 +1,82 @@ +name: 'Get artifact for stage tests' +description: 'Downloads artifact either from Github artifacts or JFrog to current working dir' +inputs: + get_from_jfrog: + description: Boolean. If false, get artifacts from Github + required: true + jfrog_build_version: + description: If getting from JFrog, what build version to get the artifact from? + required: false + dist_type_to_get: + description: 'Type of distribution to get (possible values: sdist, wheel)' + required: true + binding_nodejs_version: + description: 'If getting wheel, specify Nodejs version of binding (e.g possible value: 18)' + required: false + wheel_os: + description: 'If getting wheel, what os is it built for? Must be inside the wheel name / cibw build identifier (possible values: macosx, manylinux)' + required: false + wheel_cpu_arch: + description: 'If getting wheel, what CPU arch is it built for? Must be the same in wheel name / cibw build identifier used to build wheel (e.g possible value: x86_64)' + # Secrets + JFROG_PLATFORM_URL: + required: false + JFROG_ACCESS_TOKEN: + required: false + # Variables + JFROG_REPO_NAME: + required: false + +runs: + using: 'composite' + steps: + - if: ${{ inputs.get_from_jfrog == 'false' && inputs.dist_type_to_get == 'sdist' }} + name: 'Cat 1: Get Github artifact name for source distribution' + run: echo "GITHUB_ARTIFACT_NAME=sdist.build" >> $GITHUB_ENV + shell: bash + + # If getting a wheel from Github, construct artifact name containing that wheel + # The artifact name is the build identifier used in cibuildwheel to build that wheel + + # We also need the Nodejs tag for searching a wheel in JFrog + - name: 'Cat 2: Get Nodejs tag for build identifier' + if: ${{ inputs.dist_type_to_get == 'wheel' }} + # example: 3.9 -> cp39 + run: echo "NODEJS_TAG=cp$(echo ${{ inputs.binding_nodejs_version }} | tr -d '.')" >> $GITHUB_ENV + shell: bash + + - if: ${{ inputs.get_from_jfrog == 'false' && inputs.dist_type_to_get == 'wheel' }} + run: echo "GITHUB_ARTIFACT_NAME=${{ env.NODEJS_TAG }}-${{ inputs.wheel_os }}_${{ inputs.wheel_cpu_arch }}.build" >> $GITHUB_ENV + shell: bash + + - uses: actions/download-artifact@v4 + if: ${{ inputs.get_from_jfrog == 'false' }} + with: + name: ${{ env.GITHUB_ARTIFACT_NAME }} + + # Either way when we download from JFrog or Github, + # we need the file name pattern to install the artifact using pip later on + + - name: 'Using JFrog: Get file name glob pattern for sdist' + if: ${{ inputs.dist_type_to_get == 'sdist' }} + run: echo "ARTIFACT_FILE_NAME_PATTERN=*.tar.gz" >> $GITHUB_ENV + shell: bash + + - name: 'Using JFrog: Get file name glob pattern for wheel' + if: ${{ inputs.dist_type_to_get == 'wheel' }} + run: echo "ARTIFACT_FILE_NAME_PATTERN=*${{ env.NODEJS_TAG }}*${{ inputs.wheel_os }}*${{ inputs.wheel_cpu_arch }}.whl" >> $GITHUB_ENV + shell: bash + + # End codepath that downloads artifacts from Github + # Begin codepath that downloads from JFrog + + - uses: jfrog/setup-jfrog-cli@v4 + if: ${{ inputs.get_from_jfrog == 'true' }} + env: + JF_URL: ${{ inputs.JFROG_PLATFORM_URL }} + JF_ACCESS_TOKEN: ${{ inputs.JFROG_ACCESS_TOKEN }} + + - name: Download artifact from JFrog + if: ${{ inputs.get_from_jfrog == 'true' }} + run: jf rt dl --fail-no-op --flat --build nodejs-client/${{ inputs.jfrog_build_version }} "${{ inputs.JFROG_REPO_NAME }}/**/${{ env.ARTIFACT_FILE_NAME_PATTERN }}" + shell: bash diff --git a/.github/actions/setup-docker-on-macos/action.yml b/.github/actions/setup-docker-on-macos/action.yml new file mode 100644 index 000000000..aa8e1da0b --- /dev/null +++ b/.github/actions/setup-docker-on-macos/action.yml @@ -0,0 +1,17 @@ +name: 'Install Docker on macOS runner' +description: 'Install Docker using colima' + +runs: + using: "composite" + steps: + - name: Install Docker Engine + run: brew install colima + shell: bash + + - name: Install Docker client + run: brew install docker + shell: bash + + - name: Start Docker Engine + run: colima start + shell: bash diff --git a/.github/actions/update-version/action.yml b/.github/actions/update-version/action.yml new file mode 100644 index 000000000..21a306344 --- /dev/null +++ b/.github/actions/update-version/action.yml @@ -0,0 +1,13 @@ +name: 'Update version' +description: 'Update version in repo without committing. Repo must already be checked out' +inputs: + new_version: + description: Version string to set + required: true + +runs: + using: "composite" + steps: + - name: Update VERSION metadata + run: echo ${{ inputs.new_version }} > VERSION + shell: bash diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml new file mode 100644 index 000000000..8a90cae06 --- /dev/null +++ b/.github/workflows/build-artifacts.yml @@ -0,0 +1,105 @@ +name: Build artifacts +run-name: Build artifacts (run_tests=${{ inputs.run_tests }}, use-server-rc=${{ inputs.use-server-rc }}, server-tag=${{ inputs.server-tag }}) + +# Builds manylinux wheels and source distribution +# Optionally run tests on manylinux wheels +# Then upload artifacts to Github + +on: + workflow_dispatch: + inputs: + # There may be a case where we want to test these build debug flags on all platforms that support them + unoptimized: + description: 'macOS or Linux: Apply -O0 flag?' + type: boolean + required: false + default: false + include-debug-info-for-macos: + description: 'macOS: Build wheels for debugging?' + type: boolean + required: false + default: false + run_tests: + description: "Run integration tests with the wheels after building them" + required: true + type: boolean + default: false + use-server-rc: + type: boolean + required: true + default: false + description: 'Test against server release candidate? (e.g to test new server features)' + server-tag: + type: string + required: true + default: 'latest' + description: 'Server docker image tag (e.g to test a client backport version)' + + workflow_call: + inputs: + # The "dev" tests test the artifacts against a server + # The dev-to-stage and stage-to-master workflow only need to build the artifacts, not test them + run_tests: + required: false + type: boolean + default: false + # workflow_call hack + is_workflow_call: + type: boolean + default: true + required: false + # This input is only used in workflow_call events + sha-to-build-and-test: + description: A calling workflow may want to run this workflow on a different ref than the calling workflow's ref + type: string + # Make it required to make things simple + required: true + # A calling workflow doesn't actually set values to the inputs below + # But that workflow needs to have default values for these inputs + unoptimized: + type: boolean + required: false + default: false + include-debug-info-for-macos: + type: boolean + required: false + default: false + use-server-rc: + required: false + default: false + type: boolean + server-tag: + type: string + required: false + default: 'latest' + secrets: + DOCKER_HUB_BOT_USERNAME: + required: true + DOCKER_HUB_BOT_PW: + required: true + MAC_M1_SELF_HOSTED_RUNNER_PW: + required: true + +jobs: + build-bindings: + strategy: + matrix: + platform-tag: [ + "manylinux_x86_64", + "manylinux_aarch64", + "macosx_x86_64", + "macosx_arm64", + "win_amd64" + ] + fail-fast: false + uses: ./.github/workflows/build-bindings.yml + with: + platform-tag: ${{ matrix.platform-tag }} + # Can't use env context here, so just copy from build-sdist env var + sha-to-build-and-test: ${{ inputs.is_workflow_call == true && inputs.sha-to-build-and-test || github.sha }} + unoptimized: ${{ inputs.unoptimized }} + include-debug-info-for-macos: ${{ inputs.include-debug-info-for-macos }} + run_tests: ${{ inputs.run_tests }} + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + secrets: inherit diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 337c7f3ed..338e73528 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -1,599 +1,359 @@ -name: Build binding -run-name: Build bindings (run_tests=${{ inputs.run_tests }}, use-server-rc=${{ inputs.use-server-rc }}, server-tag=${{ inputs.server-tag }}) +name: 'Build wheels' +run-name: 'Build wheels (nodejs-tags=${{ inputs.nodejs-tags }}, platform-tag=${{ inputs.platform-tag }}, unoptimized=${{ inputs.unoptimized }}, include-debug-info-for-macos=${{ inputs.include-debug-info-for-macos }}, run_tests=${{ inputs.run_tests }}, use-server-rc=${{ inputs.use-server-rc }}, server-tag=${{ inputs.server-tag }})' -# Builds manylinux bindings and source distribution -# If running tests, publish results in commit status -# Publishes bindings and source distribution on Github Actions if no tests are run or tests pass +# Build wheels on all (or select) Python versions supported by the Python client for a specific platform on: - push: - branches: ["stage", "master"] - pull_request: - branches: ["stage", "master"] - types: [ - # Default triggers - opened, - synchronize, - reopened, - # Additional triggers - labeled, - unlabeled - ] + workflow_dispatch: inputs: - # If we only want to check that the builds pass on an arbitrary branch - run_tests: - description: "Run integration tests" + # These are the usual cases for building wheels: + # + # 1. One wheel for *one* supported Python version. This is for running specialized tests that only need one Python version + # like valgrind or a failing QE test. And usually, we only need one wheel for debugging purposes. + # 2. Wheels for *all* supported Python versions for *one* supported platform. This is useful for testing workflow changes for a + # single OS or CPU architecture (e.g testing that changes to debugging modes work on all Python versions) + # 3. Wheels for *all* supported Python versions and *all* supported platforms. This is for building wheels for different + # CI/CD stages (e.g dev, stage, or master). We can also test debugging modes for all platforms that support them + # + # We're able to combine case 1 and 2 into one workflow by creating an input that takes in a JSON list of strings (Python tags) + # to build wheels for. Actual list inputs aren't supported yet, so it's actually a JSON list encoded as a string. + # + # However, it's harder to combine this workflow (case 1 + 2) with case 3, because matrix outputs don't exist yet + # in Github Actions. So all jobs in the cibuildwheel job would have to pass for a self hosted job to run. + # We want each platform to be tested independently of each other, + # so there is a wrapper workflow that has a list of platforms to test and reuses this workflow for each platform. + # If one platform fails, it will not affect the building and testing of another platform (we disable fail fast mode) + nodejs-tags: + type: string + description: Valid JSON list of Python tags to build the client for + required: false + default: '["v108", "v115", "v127", "v131"]' + platform-tag: + description: Platform to build the client for. + type: choice required: true + options: + - manylinux_x86_64 + - manylinux_aarch64 + - macosx_x86_64 + - macosx_arm64 + - win_amd64 + # Makes debugging via gh cli easier. + default: manylinux_x86_64 + unoptimized: + description: 'macOS or Linux: Apply -O0 flag?' + # Windows supports a different flag to disable optimizations, but we haven't added support for it yet type: boolean - default: true + required: false + default: false + include-debug-info-for-macos: + description: 'macOS: Build wheels for debugging?' + type: boolean + required: false + default: false + run_tests: + description: 'Run Aerospike server and run tests using built wheels?' + type: boolean + required: false + default: false use-server-rc: type: boolean required: true default: false description: 'Test against server release candidate?' - # If we are creating a backport and want to test an arbitrary branch against an older server version server-tag: required: true default: 'latest' description: 'Server docker image tag' + workflow_call: inputs: - # The dev tests test the artifacts against a server release - # The stage tests and release workflow only need to build the artifacts - run_tests: - description: "Run integration tests" - required: true + # See workflow call hack in update-version.yml + is_workflow_call: type: boolean default: true - commit_sha: - type: string required: false - # Calling workflow doesn't actually use these 2 options - # But we need to set default values for workflow calls - use-server-rc: - required: false - default: true - type: boolean - server-tag: + nodejs-tags: type: string required: false - default: 'latest' - secrets: - DOCKER_HUB_BOT_USERNAME: - required: false - DOCKER_HUB_BOT_PW: + default: '["v108", "v115", "v127", "v131"]' + platform-tag: + type: string + required: true + # Only used in workflow_call event + sha-to-build-and-test: + type: string + required: true + unoptimized: + type: boolean required: false - MAC_M1_SELF_HOSTED_RUNNER_PW: + default: false + include-debug-info-for-macos: + type: boolean required: false - workflow_dispatch: - inputs: - # If we only want to check that the builds pass on an arbitrary branch + default: false run_tests: - description: "Run integration tests" - required: true type: boolean - default: true + required: false + default: false use-server-rc: + required: false type: boolean - required: true default: false description: 'Test against server release candidate?' - # If we are creating a backport and want to test an arbitrary branch against an older server version server-tag: - required: true + required: false + type: string default: 'latest' description: 'Server docker image tag' + secrets: + # Just make all the secrets required to make things simpler... + DOCKER_HUB_BOT_USERNAME: + required: true + DOCKER_HUB_BOT_PW: + required: true + MAC_M1_SELF_HOSTED_RUNNER_PW: + required: true + +env: + COMMIT_SHA_TO_BUILD_AND_TEST: ${{ inputs.is_workflow_call == true && inputs.sha-to-build-and-test || github.sha }} + # Note that environment variables in Github are all strings + # Github mac m1 and windows runners don't support Docker / nested virtualization + # so we need to use self-hosted runners to test wheels for these platforms + RUN_INTEGRATION_TESTS_IN_CIBW: ${{ inputs.run_tests && (startsWith(inputs.platform-tag, 'manylinux') || inputs.platform-tag == 'macosx_x86_64') }} jobs: - manylinux: + # Maps don't exist in Github Actions, so we have to store the map using a script and fetch it in a job + # This uses up more billing minutes (rounded up to 1 minute for each job run), + # but this should be ok based on the minutes usage data for the aerospike organization + get-runner-os: + outputs: + runner-os: ${{ steps.get-runner-os.outputs.runner_os }} runs-on: ubuntu-22.04 + steps: + - id: get-runner-os + # Single source of truth for which runner OS to use for each platform tag + run: | + declare -A hashmap + hashmap[manylinux_x86_64]="ubuntu-22.04" + hashmap[manylinux_aarch64]="aerospike_arm_runners_2" + hashmap[macosx_x86_64]="macos-12-large" + hashmap[macosx_arm64]="macos-14" + hashmap[win_amd64]="windows-2022" + echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT + # Bash >= 4 supports hashmaps + shell: bash + + cibuildbinding: + needs: get-runner-os strategy: - fail-fast: false matrix: - # nodejs versions to build bindings on - nodejs: [ - ["v108", 18], - ["v115", 20], - ["v127", 22], - ["v131", 23] - ] - platform: [ - "x86_64", - #"aarch64" - ] - + nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} + fail-fast: false + runs-on: ${{ needs.get-runner-os.outputs.runner-os }} + env: + BUILD_IDENTIFIER: "${{ matrix.nodejs-tag }}-${{ inputs.platform-tag }}" + MACOS_OPENSSL_VERSION: 3 steps: + - name: Create status check message + run: echo STATUS_CHECK_MESSAGE="cibuildbinding (${{ env.BUILD_IDENTIFIER }})" >> $GITHUB_ENV + shell: bash - name: Show job status for commit uses: myrotvorets/set-commit-status-action@v2.0.0 + if: ${{ github.event_name != 'push' && github.event_name != 'pull_request' }} with: - sha: ${{ github.sha }} - context: "Build bindings (${{ matrix.nodejs[0] }}-manylinux_${{ matrix.platform }})" + sha: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} + context: ${{ env.STATUS_CHECK_MESSAGE }} - uses: actions/checkout@v4 with: submodules: recursive - ref: ${{ inputs.commit_sha }} - - - uses: actions/setup-node@v4 + ref: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} + # We need the last tag before the ref, so we can relabel the version if needed + fetch-depth: 0 + + - name: 'Windows: Install C client deps' + if: ${{ inputs.platform-tag == 'win_amd64' }} + run: nuget restore + working-directory: aerospike-client-c/vs + + - name: 'macOS x86: Setup Docker using colima for testing' + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} + uses: ./.github/actions/setup-docker-on-macos + + - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} + uses: ./.github/actions/run-ee-server with: - node-version: ${{ matrix.nodejs[1] }} - architecture: 'x64' - - - name: print - run: uname -m - - - name: Set up QEMU for cross compiling arm64 - if: ${{ matrix.platform == 'aarch64' }} - uses: docker/setup-qemu-action@v3 + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + # TODO: combine this composite action and the above into one + - name: "Linux: run Aerospike server in Docker container and configure config.conf to connect to the server container's Docker IP address" + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} + uses: ./.github/actions/run-ee-server-for-ext-container with: - platforms: all - - - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} - password: ${{ secrets.DOCKER_HUB_BOT_PW }} - - - - name: Run Aerospike server release candidate with latest tag - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest - - - name: Run Aerospike server - if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - run: | - npm i @types/mocha @types/yargs @types/semver @types/chai; - docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/mail/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file /etc/mail/aerospike.conf - -# - name: Set config.conf to use Docker IP address of Aerospike server -# # config.conf should be copied into the cibuildwheel Docker container -# run: | -# export SERVER_DOCKER_IP=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) -# # Install crudini -# pip install crudini -c ../.github/workflows/requirements.txt -# sed -i "s/127.0.0.1:3000//" config.conf -# crudini --set config.conf enterprise-edition hosts ${SERVER_DOCKER_IP}:3000 -# working-directory: test - - - name: Enable tests + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + # FIND NO SERVER TESTS AND RUN THEM + # + #- name: If not running tests against server, only run basic import test + # if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'false' }} + # # Use double quotes otherwise Windows will throw this error in cibuildwheel + # # 'import + # # ^ + # # SyntaxError: EOL while scanning string literal + # run: echo "TEST_COMMAND=python -c \"import aerospike\"" >> $GITHUB_ENV + # shell: bash + + - name: Otherwise, enable integration tests + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' }} run: echo "TEST_COMMAND=cd ts-test; npm install typescript --save-dev; npx tsc; cd ..; npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV + shell: bash -# - name: Disable tests (only run basic import test) -# if: ${{ !inputs.run_tests }} -# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV - - - uses: uraimo/run-on-arch-action@v2 - name: Build client arm - if: ${{ matrix.platform == 'aarch64' }} - id: runcmd - with: - arch: aarch64 - distro: ubuntu-22.04 + - name: Set unoptimize flag + if: ${{ inputs.unoptimized && (startsWith(inputs.platform-tag, 'manylinux') || startsWith(inputs.platform-tag, 'macosx')) }} + run: echo "UNOPTIMIZED=1" >> $GITHUB_ENV - # Set an output parameter `uname` for use in subsequent steps - run: | - apt update - apt install -y g++ libssl-dev zlib1g-dev make build-essential libuv1-dev wget curl - ./scripts/build-c-client.sh - wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash; - source ~/.bashrc; - nvm i 22 - npm install + - name: Set include dsym flag + if: ${{ inputs.include-debug-info-for-macos && startsWith(inputs.platform-tag, 'macosx') }} + run: echo "INCLUDE_DSYM=1" >> $GITHUB_ENV - - name: Build client x64 - if: ${{ matrix.platform != 'aarch64' }} + - name: Build Binding run: | - sudo apt update - sudo apt install g++ libssl-dev zlib1g-dev; - sudo apt-get install -y make; - sudo apt install build-essential; - ./scripts/build-c-client.sh - npm install - env: - CFLAGS: '-Werror' - - - name: Test client - run: | - ${{ env.TEST_COMMAND }} - - - name: Send binding to test jobs + ./scripts/build-c-client.sh; + npm install; + + # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! + #- name: Build wheel + # uses: pypa/cibuildwheel@v2.20.0 + # env: + # CIBW_ENVIRONMENT_PASS_LINUX: ${{ inputs.unoptimized && 'UNOPTIMIZED' || '' }} + # CIBW_ENVIRONMENT_MACOS: SSL_LIB_PATH="$(brew --prefix openssl@${{ env.MACOS_OPENSSL_VERSION }})/lib/" CPATH="$(brew --prefix openssl@${{ env.MACOS_OPENSSL_VERSION }})/include/" STATIC_SSL=1 + # CIBW_BUILD: ${{ env.BUILD_IDENTIFIER }} + # CIBW_BUILD_FRONTEND: build + # CIBW_BEFORE_ALL_LINUX: > + # yum install openssl-devel -y && + # yum install python-devel -y && + # yum install python-setuptools -y + # # delvewheel is not enabled by default but we do need to repair the wheel + # CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel" + # CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path ./aerospike-client-c/vs/x64/Release -w {dest_dir} {wheel}" + # CIBW_TEST_COMMAND: ${{ env.TEST_COMMAND }} +# + - name: Upload wheels to GitHub uses: actions/upload-artifact@v4 + if: ${{ !cancelled() }} with: - name: ${{ matrix.nodejs[0] }}-manylinux_${{ matrix.platform }}.build - path: ./lib/binding/node-*-linux-*/ + path: ./lib/binding/* + name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status uses: myrotvorets/set-commit-status-action@v2.0.0 - if: always() + if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} with: - sha: ${{ github.sha }} + sha: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} status: ${{ job.status }} - context: "Build bindings (${{ matrix.nodejs[0] }}-manylinux_${{ matrix.platform }})" + context: ${{ env.STATUS_CHECK_MESSAGE }} - macOS-x86: + test-self-hosted: + needs: cibuildbinding + # There's a top-level env variable for this but we can't use it here, unfortunately + if: ${{ inputs.run_tests && (inputs.platform-tag == 'macosx_arm64' || inputs.platform-tag == 'win_amd64') }} strategy: fail-fast: false matrix: - nodejs: [ - ["v108", 18], - ["v115", 20], - ["v127", 22], - ['v131', 23] - ] - runs-on: macos-13 + nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} + runs-on: ${{ inputs.platform-tag == 'macosx_arm64' && fromJSON('["self-hosted", "macOS", "ARM64"]') || fromJSON('["self-hosted", "Windows", "X64"]') }} + env: + BUILD_IDENTIFIER: "${{ matrix.nodejs-tag }}-${{ inputs.platform-tag }}" steps: - - name: Show job status for commit - uses: myrotvorets/set-commit-status-action@v2.0.0 - with: - sha: ${{ github.sha }} - context: "Build bindings (${{ matrix.nodejs[0] }}-macosx_x86_64)" - - - uses: actions/checkout@v4 - with: - submodules: recursive - ref: ${{ inputs.commit_sha }} - - - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.nodejs[1] }} - architecture: 'x64' - -# - name: Install Docker Engine -# run: brew install colima -# -# - name: Install Docker client -# run: brew install docker -# -# - name: Start Docker Engine -# run: colima start -# -# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} -# password: ${{ secrets.DOCKER_HUB_BOT_PW }} -# -# - name: Run Aerospike server release candidate with latest tag -# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest -# -# - name: Run Aerospike server -# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server -# -# - name: Enable tests -# run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000 --t 30000" >> $GITHUB_ENV - -# - name: Disable tests (only run basic import test) -# if: ${{ !inputs.run_tests }} -# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV - - - name: Build client - run: | - ./scripts/build-c-client.sh - npm install - env: - CFLAGS: '-Werror' - -# - name: Test client -# run: | -# ${{ env.TEST_COMMAND }} - - - name: Save macOS binding - uses: actions/upload-artifact@v4 - with: - name: ${{ matrix.nodejs[0] }}-macosx_x86_64.build - path: ./lib/binding/*/ - - - name: Set final commit status - uses: myrotvorets/set-commit-status-action@v2.0.0 - if: always() - with: - status: ${{ job.status }} - sha: ${{ github.sha }} - context: "Build bindings (${{ matrix.nodejs[0] }}-macosx_x86_64)" - -# macOS-m1: -# runs-on: [ -# self-hosted, -# macOS, -# ARM64 -# ] -# strategy: -# matrix: -# nodejs-version: [ -# ["v108", "18"], -# ["v115", "20"], -# ["v127", 22] -# ] -# fail-fast: false -# steps: -# - name: Show job status for commit -# uses: myrotvorets/set-commit-status-action@v2.0.0 -# with: -# sha: ${{ github.sha }} -# context: "Build bindings (${{ matrix.nodejs-version[1] }}-macosx_arm64)" -# -# - uses: actions/checkout@v4 -# with: -# submodules: recursive -# ref: ${{ inputs.commit_sha }} -# -# - name: Install NVM -# run: | -# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash -# source ~/.zshrc -# nvm -v -# nvm install ${{ matrix.nodejs-version[1] }} -# -# -# - name: Setup symlink folders -# run: | -# sudo rm -rf /usr/local/opt/openssl; -# sudo rm -rf /usr/local/opt/libuv; -# sudo mkdir -p /usr/local/opt; -# sudo chown -R $(whoami) /usr/local/opt -# -# - name: Install brew packages -# run: | -# brew install openssl@3.2.1 -# brew install libuv@1.47.0 -# -# - name: Set environment for building -# run: | -# echo "export PATH="/usr/local/bin/:/usr/local/opt/openssl/bin:$PATH" -# export LDFLAGS="-L/usr/local/opt/openssl/lib" -# export CPPFLAGS="-I/usr/local/opt/openssl/include" -# export EXT_CFLAGS="-I/usr/local/opt/openssl/include"" >> ~/.zshrc; -# source ~/.zshrc; -# -# - name: Setup symlink folders -# run: | -# sudo ln -s /usr/local/Cellar/libuv/1.47.0/ /usr/local/opt/libuv; -# sudo ln -s /usr/local/Cellar/openssl@3/3.2.1/ /usr/local/opt/openssl; -# -# # Self-hosted runner only -# # Need to be able to save Docker Hub credentials to keychain -# - run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} -# if: ${{ inputs.run_tests && inputs.use-server-rc }} -# -# - if: ${{ inputs.run_tests && inputs.use-server-rc }} -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} -# password: ${{ secrets.DOCKER_HUB_BOT_PW }} -# -# - name: Use server rc -# if: ${{ inputs.run_tests && inputs.use-server-rc }} -# run: echo IMAGE_NAME="${{ vars.SERVER_RC_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV -# -# - name: Use server release -# if: ${{ inputs.run_tests && !inputs.use-server-rc }} -# run: echo IMAGE_NAME="${{ vars.SERVER_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV -# -# - name: Run server -# if: ${{ inputs.run_tests }} -# run: docker run -d -p 3000:3000 --name aerospike ${{ env.IMAGE_NAME }} -# -# - name: Build client -# run: | -# ./scripts/build-c-client.sh -# npm install -# env: -# CFLAGS: '-Werror' -# -# - name: Enable tests -# if: ${{ inputs.run_tests }} -# run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV -# -# - name: Disable tests (only run basic import test) -# if: ${{ !inputs.run_tests }} -# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV -# -# -# - name: Test client -# run: | -# ${{ env.TEST_COMMAND }} -# -# - name: Save macOS wheel -# uses: actions/upload-artifact@v4 -# with: -# name: ${{ matrix.nodejs-version[0] }}-macosx_arm64.build -# path: ./lib/binding/*/ -# -# - name: Stop server -# if: ${{ always() && inputs.run_tests }} -# run: | -# docker container stop aerospike -# docker container prune -f -# -# - name: Set final commit status -# uses: myrotvorets/set-commit-status-action@v2.0.0 -# if: always() -# with: -# sha: ${{ github.sha }} -# status: ${{ job.status }} -# context: "Build bindings (${{ matrix.nodejs-version[0] }}-macosx_arm64)" - - test-npm-install: - runs-on: ubuntu-22.04 - needs: [manylinux, macOS-x86] - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - - uses: ./.github/workflows/combine-bindings/ - - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} - architecture: 'x64' - - - name: Modify the package.json - run: | - sudo npm install -g json - - - - name: Modify the package.json - run: | - sudo npm install -g json - json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - - name: Run tests - run: | - mkdir -p testDir - cd testDir - pwd - sudo npm install .. - - test-yarn-install: - runs-on: ubuntu-22.04 - needs: [manylinux, macOS-x86] - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - - uses: ./.github/workflows/combine-bindings/ - - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} - architecture: 'x64' - - - name: Modify the package.json - run: | - sudo npm install -g json - json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - - name: Run tests - run: | - mkdir -p testDir - yarn link - cd testDir - npm install --global yarn - yarn add link:.. - - test-pnpm-install: - runs-on: ubuntu-22.04 - needs: [manylinux, macOS-x86] - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - - uses: ./.github/workflows/combine-bindings/ - - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} - architecture: 'x64' - - - name: Modify the package.json - run: | - sudo npm install -g json - json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" - - - name: Run tests - run: | - mkdir -p testDir - cd testDir - npm install --global pnpm - SHELL=bash pnpm setup - source /home/runner/.bashrc - pnpm install .. - - test-bun-install: - runs-on: ubuntu-latest - needs: [manylinux, macOS-x86] - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive + - name: Create status check message + run: echo STATUS_CHECK_MESSAGE="Test on self hosted (${{ env.BUILD_IDENTIFIER }})" >> $GITHUB_ENV + shell: bash + + - name: Show job status for commit + uses: myrotvorets/set-commit-status-action@v2.0.0 + if: ${{ github.event_name != 'push' && github.event_name != 'pull_request' }} + with: + sha: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} + context: ${{ env.STATUS_CHECK_MESSAGE }} + + - uses: actions/checkout@v4 + with: + ref: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} + + # Need to be able to save Docker Hub credentials to keychain + - if: ${{ inputs.platform-tag == 'macosx_arm64' && inputs.use-server-rc }} + run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} + + - uses: ./.github/actions/run-ee-server + with: + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Download wheel + uses: actions/download-artifact@v4 + with: + name: ${{ env.BUILD_IDENTIFIER }}.build + + - name: Convert Python tag to Python version + # Don't use sed because we want this command to work on both mac and windows + # The command used in GNU sed is different than in macOS sed + run: | + NODEJS_TAG=${{ matrix.nodejs-tag }} + NODEJS_VERSION="${NODEJS_TAG/cp/}" + echo NODEJS_VERSION="${NODEJS_VERSION/3/3.}" >> $GITHUB_ENV + shell: bash - - uses: ./.github/workflows/combine-bindings/ + - uses: actions/setup-node@v5 + with: + nodejs-version: ${{ env.NODEJS_VERSION }} - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} - architecture: 'x64' - - - name: Modify the package.json - run: | - sudo npm install -g json - json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + - name: Install wheel + run: | + ./scripts/build-c-client.sh + npm install + shell: bash - - name: Run tests - run: | - npm install -g bun - bun link - mkdir -p testDir - cd testDir - bun link aerospike - -# test-typescript-install: -# runs-on: ubuntu-22.04 -# needs: [manylinux, macOS-x86] -# steps: -# - uses: actions/checkout@v2 -# with: -# submodules: recursive -# -# - uses: ./.github/workflows/combine-bindings/ -# -# - uses: actions/setup-node@v4 -# with: -# node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} -# architecture: 'x64' -# -# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} -# password: ${{ secrets.DOCKER_HUB_BOT_PW }} -# -# -# - name: Run Aerospike server release candidate with latest tag -# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest -# -# - name: Run Aerospike server -# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} -# run: | -# cd ts-test; -# npm i --save-dev @types/mocha; -# npm i --save-dev @types/yargs; -# npm i --save-dev @types/semver; -# npm i --save-dev @types/chai; -# tsc; -# cd ..; -# npm install; -# docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server -# -# -# -# - name: Wait for database to be ready -# # Should be ready after 3 seconds -# run: sleep 15 -# -# - name: Modify the package.json -# run: | -# sudo npm install -g json -# json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" -# -# - name: Run tests -# run: | -# mkdir my-aerospike-project -# cd my-aerospike-project -# npm init -y -# npm install typescript ts-node --save-dev -# npm install .. -# cp ../examples/typescript.ts index.ts -# npx tsc index.ts -# node index.js \ No newline at end of file + - name: Connect to Docker container on remote machine with Docker daemon + if: ${{ inputs.platform-tag == 'win_amd64' }} + # DOCKER_HOST contains the IP address of the remote machine + run: | + $env:DOCKER_HOST_IP = $env:DOCKER_HOST | foreach {$_.replace("tcp://","")} | foreach {$_.replace(":2375", "")} + crudini --set config.conf enterprise-edition hosts ${env:DOCKER_HOST_IP}:3000 + working-directory: test + + # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN + - run: | + npm install typescript --save-dev; + npx tsc; + + working-directory: ts-test + shell: bash + + - run: npx tsc + shell: bash + + - run: npm run test dist/ -- --h 127.0.0.1 --port 3000 + shell: bash + + - name: Show job status for commit + if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} + uses: myrotvorets/set-commit-status-action@v2.0.0 + with: + sha: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} + status: ${{ job.status }} + context: ${{ env.STATUS_CHECK_MESSAGE }} diff --git a/.github/workflows/bump-stage-and-upload-to-jfrog.yml b/.github/workflows/bump-stage-and-upload-to-jfrog.yml new file mode 100644 index 000000000..922c94de9 --- /dev/null +++ b/.github/workflows/bump-stage-and-upload-to-jfrog.yml @@ -0,0 +1,67 @@ +on: + workflow_call: + inputs: + passed-dev-tag: + type: string + description: Dev tag to fast forward the stage branch to + required: true + secrets: + # Used to bump version in Github + CLIENT_BOT_PAT: + required: true + # Used to upload to JFrog + JFROG_PLATFORM_URL: + required: true + JFROG_ACCESS_TOKEN: + required: true + +jobs: + ff-stage-to-dev-tag: + name: Fast forward stage branch to the dev tag that passed stage testing + uses: ./.github/workflows/fast-forward-merge.yml + with: + ref_to_merge: ${{ inputs.passed-dev-tag }} + base_branch: ${{ vars.STAGE_BRANCH_NAME }} + secrets: inherit + + promote-dev-build-to-rc: + name: Bump (promote) the dev version to an RC version in the stage branch + needs: ff-stage-to-dev-tag + uses: ./.github/workflows/bump-version.yml + with: + change: 'promote-dev-build-to-rc' + ref: ${{ vars.STAGE_BRANCH_NAME }} + secrets: inherit + + rebuild-artifacts-with-rc-version: + needs: promote-dev-build-to-rc + uses: ./.github/workflows/build-artifacts.yml + with: + sha-to-build-and-test: ${{ needs.promote-dev-build-to-rc.outputs.bump_sha }} + secrets: inherit + + upload-rc-artifacts-to-jfrog: + needs: [ + rebuild-artifacts-with-rc-version, + # We need the new RC version to label the build in JFrog + promote-dev-build-to-rc + ] + name: Upload artifacts to JFrog + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.promote-dev-build-to-rc.outputs.new_version }} + secrets: inherit + + # See reason for deleting artifacts in dev-workflow-p2.yml + delete-artifacts: + needs: upload-rc-artifacts-to-jfrog + uses: ./.github/workflows/delete-artifacts.yml + + ff-dev-to-stage: + name: Fast forward dev branch to stage branch to include the bump to RC commit + needs: promote-dev-build-to-rc + uses: ./.github/workflows/fast-forward-merge.yml + with: + ref_to_merge: origin/${{ vars.STAGE_BRANCH_NAME }} + base_branch: ${{ vars.DEV_BRANCH_NAME }} + secrets: inherit diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml new file mode 100644 index 000000000..cec01cb05 --- /dev/null +++ b/.github/workflows/bump-version.yml @@ -0,0 +1,84 @@ +# Takes in how to bump version as input +# Commits changes to bump version and outputs the new version and commit hash as output + +name: Bump version +on: + workflow_dispatch: + inputs: + change: + type: choice + description: Python script name to update the version + required: true + options: + - bump-dev-num + - promote-dev-build-to-rc + - promote-rc-build-to-release + workflow_call: + inputs: + change: + # Since workflow_call doesn't support 'options' input type, + # we take in a string instead that must be a valid Python script name (excluding the .py part) + # Example: bump-dev-num for bump-dev-num.py + type: string + description: Python script name to change version + required: true + ref: + required: false + description: Commit to bump off of + type: string + # See workflow call hack in update-version.yml + is_workflow_call: + type: boolean + default: true + required: false + secrets: + CLIENT_BOT_PAT: + required: true + outputs: + new_version: + value: ${{ jobs.get-new-version.outputs.new_version }} + bump_sha: + value: ${{ jobs.update-version-in-repo.outputs.bump_sha }} + +jobs: + get-current-version: + name: Get new version string + runs-on: ubuntu-22.04 + outputs: + current_version: ${{ steps.get-current-version.outputs.current_version }} + steps: + # Checkout the branch where we want to bump the new version + - uses: actions/checkout@v4 + with: + token: ${{ secrets.CLIENT_BOT_PAT }} + ref: ${{ inputs.ref }} + + - name: Get current version + id: get-current-version + run: echo current_version=$(cat VERSION) >> $GITHUB_OUTPUT + + get-new-version: + runs-on: ubuntu-22.04 + needs: get-current-version + outputs: + new_version: ${{ steps.get-new-version.outputs.new_version }} + steps: + # Checkout branch where workflow is being called from + - uses: actions/checkout@v4 + + - name: Install library that parses PEP 440 versions + # NEED TO CHANGE THIS TO WORK WITH NODEJS + run: pip install parver -c requirements.txt + working-directory: .github/workflows + + - name: Get new version + id: get-new-version + run: echo new_version=$(python3 .github/workflows/${{ inputs.change }}.py ${{ needs.get-current-version.outputs.current_version }}) >> $GITHUB_OUTPUT + + update-version-in-repo: + needs: get-new-version + uses: ./.github/workflows/update-version.yml + with: + new_version: ${{ needs.get-new-version.outputs.new_version }} + ref: ${{ inputs.is_workflow_call && inputs.ref || github.ref }} + secrets: inherit diff --git a/.github/workflows/delete-artifacts.yml b/.github/workflows/delete-artifacts.yml new file mode 100644 index 000000000..a5b6a7380 --- /dev/null +++ b/.github/workflows/delete-artifacts.yml @@ -0,0 +1,11 @@ +on: + workflow_call: + +jobs: + delete-artifacts: + runs-on: ubuntu-22.04 + steps: + - name: Remove artifacts with dev version + uses: geekyeggo/delete-artifact@v5 + with: + name: '*.node' diff --git a/.github/workflows/dev-to-stage.yml b/.github/workflows/dev-to-stage.yml new file mode 100644 index 000000000..5e8d203ae --- /dev/null +++ b/.github/workflows/dev-to-stage.yml @@ -0,0 +1,60 @@ +name: Dev to stage + +on: + # This workflow manipulates the stage and dev branches regardless of the branch this workflow is run from + workflow_dispatch: + +jobs: + # We want to skip the stage tests if the changes made between dev and stage wouldn't affect the results of the stage tests + compare-latest-dev-tag-and-stage: + outputs: + # This is always available, but the stage tests only use it if they're being run (i.e not skipped) + latest-dev-tag: ${{ steps.get-dev-tag.outputs.latest-dev-tag }} + run_stage_tests: ${{ steps.run_stage_tests.outputs.run_stage_tests }} + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + with: + # Get all tags + fetch-depth: 0 + + - name: Get latest dev tag + run: echo latest-dev-tag=$(git describe --tags --abbrev=0 origin/${{ vars.DEV_BRANCH_NAME }}) >> $GITHUB_OUTPUT + id: get-dev-tag + + - name: Get number of files that were changed between dev and stage (with some exceptions) + run: echo NUM_FILES_CHANGED=$(git diff origin/${{ vars.STAGE_BRANCH_NAME }}..origin/${{ vars.DEV_BRANCH_NAME }} --name-only | grep --invert-match --count -e "^doc/" -e "^aerospike-stubs/" -e VERSION) >> $GITHUB_ENV + # We want this step to fail if a command failed while using pipes + shell: bash + + - name: If any files were changed besides the exceptions, run the stage tests + run: echo run_stage_tests=${{ env.NUM_FILES_CHANGED != '0' }} >> $GITHUB_OUTPUT + id: run_stage_tests + + run-stage-tests-on-jfrog-artifacts: + needs: compare-latest-dev-tag-and-stage + # All job outputs are unicode strings + if: ${{ needs.compare-latest-dev-tag-and-stage.outputs.run_stage_tests == 'true' }} + uses: ./.github/workflows/stage-tests.yml + # Need to pass in JFrog secrets + secrets: inherit + with: + use_jfrog_builds: true + jfrog-build-version-to-test: ${{ needs.compare-latest-dev-tag-and-stage.outputs.latest-dev-tag }} + + # Stage tests have passed or skipped + # so it is safe to update the stage branch with the changes in dev, promote the version to an RC, and rebuild and upload the RC to JFrog + # We store the subsequent jobs after the stage tests in a separate reusable workflow... + # because if stage tests were skipped, all subsequent jobs will be skipped by default too (both direct and indirect descendents) + # This means we have to add a manual check for each subsequent job that checks if the stage tests were skipped in order to run them + # It's easier to just add this manual check once to a reusable workflow that wraps around all the subsequent jobs + bump-stage-and-upload-to-jfrog: + needs: [ + run-stage-tests-on-jfrog-artifacts, + compare-latest-dev-tag-and-stage + ] + if: ${{ !cancelled() && needs.compare-latest-dev-tag-and-stage.result == 'success' && (needs.run-stage-tests-on-jfrog-artifacts.result == 'success' || needs.run-stage-tests-on-jfrog-artifacts.result == 'skipped') }} + uses: ./.github/workflows/bump-stage-and-upload-to-jfrog.yml + with: + passed-dev-tag: ${{ needs.compare-latest-dev-tag-and-stage.outputs.latest-dev-tag }} + secrets: inherit diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml new file mode 100644 index 000000000..7dbd6527b --- /dev/null +++ b/.github/workflows/dev-workflow-p1.yml @@ -0,0 +1,37 @@ +name: Dev workflow (part 1) + +# 1. When a PR review is requested, run tests on that PR +# 2. If all of the tests pass, allow the PR to be merged into `dev` +# 3. Whenever a PR is merged to `dev`, bump version number in `dev` + +on: + pull_request: + types: + - review_requested + branches: + - 'dev*' + paths-ignore: + - 'docs/**' + - 'aerospike-stubs/**' + + # So we can test changes to the test-server-rc workflow + workflow_dispatch: + inputs: + run_server_release_tests: + description: 'DEBUG: Run server release tests in build-wheels workflow?' + type: boolean + default: false + +jobs: + test-with-server-release: + uses: ./.github/workflows/build-artifacts.yml + with: + run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} + sha-to-build-and-test: ${{ github.sha }} + secrets: inherit + + test-with-server-rc: + needs: test-with-server-release + if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + uses: ./.github/workflows/test-server-rc.yml + secrets: inherit diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml new file mode 100644 index 000000000..7427ec970 --- /dev/null +++ b/.github/workflows/dev-workflow-p2.yml @@ -0,0 +1,43 @@ +name: Dev workflow (part 2) + +on: + pull_request_target: + branches: + - 'dev*' + types: + - closed + workflow_dispatch: + +jobs: + bump-dev-number: + if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + uses: ./.github/workflows/bump-version.yml + with: + change: 'bump-dev-num' + secrets: inherit + + rebuild-artifacts-with-new-dev-num: + needs: bump-dev-number + name: Rebuild artifacts with new dev number + uses: ./.github/workflows/build-artifacts.yml + with: + # On pull_request_target, the bump version commit will be ignored + # So we must pass it manually to the workflow + sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} + secrets: inherit + + upload-to-jfrog: + name: Upload artifacts to JFrog + needs: [ + bump-dev-number, + rebuild-artifacts-with-new-dev-num + ] + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit + + # We don't want the artifacts in JFrog to also exist in Github + delete-artifacts: + needs: upload-to-jfrog + uses: ./.github/workflows/delete-artifacts.yml diff --git a/.github/workflows/fast-forward-merge.yml b/.github/workflows/fast-forward-merge.yml new file mode 100644 index 000000000..6b1237d25 --- /dev/null +++ b/.github/workflows/fast-forward-merge.yml @@ -0,0 +1,43 @@ +# As of this writing, there are no Github Actions in the marketplace +# that allow fast forwarding using a personal access token +# So we need to use this for now +name: 'Fast forward merge' +on: + workflow_dispatch: + inputs: + ref_to_merge: + type: string + required: true + base_branch: + type: string + required: true + workflow_call: + inputs: + # If another branch, it must be origin/ + ref_to_merge: + type: string + required: true + base_branch: + type: string + required: true + secrets: + CLIENT_BOT_PAT: + required: true + +jobs: + merge: + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + # Fetch the whole history to prevent unrelated history errors + fetch-depth: '0' + ref: ${{ inputs.base_branch }} + token: ${{ secrets.CLIENT_BOT_PAT }} + + - name: Fast forward + run: git merge --ff-only ${{ inputs.ref_to_merge }} + + - name: Upload changes to remote head branch + run: git push diff --git a/.github/workflows/stage-tests.yml b/.github/workflows/stage-tests.yml new file mode 100644 index 000000000..a7664a3e0 --- /dev/null +++ b/.github/workflows/stage-tests.yml @@ -0,0 +1,208 @@ +name: Stage tests + +# Downloads artifacts either from Github or JFrog +# and runs category 1 (source distribution) and category 2 (binary distribution) tests +# The purpose is to test that our artifacts work on the Linux distros / OS versions that the client supports +# and QE doesn't have enough disk space for more Linux distros, so we have some tests here in Github Actions + +on: + workflow_call: + inputs: + use_jfrog_builds: + description: If false, download artifacts from Github + required: true + type: boolean + default: true + jfrog-build-version-to-test: + description: Used only when use_jfrog_builds is true. + type: string + required: false + # These will be set if use_jfrog_builds is false (i.e when someone is building the artifacts from scratch and stage testing them in a calling workflow) + # If use_jfrog_builds is true, only the defaults will be used + use-server-rc: + type: boolean + required: false + default: false + description: 'Test against server release candidate?' + server-tag: + type: string + required: false + default: 'latest' + description: 'Server docker image tag' + test-macos-x86: + required: false + type: boolean + default: false + description: 'Test macOS x86 wheels (unstable)' + +jobs: + linux-distro-tests: + strategy: + matrix: + test-case: [ + # Docker image + tag, test category, Docker image platform (cpu arch), Python version + ["amazonlinux:2023", 2, "linux/amd64", "3.9"], + ["amazonlinux:2023", 2, "linux/arm64", "3.9"], + ["amazonlinux:2023", 2, "linux/amd64", "3.11"], + ["amazonlinux:2023", 2, "linux/arm64", "3.11"], + ["ubuntu:22.04", 2, "linux/amd64", "3.10"], + ["ubuntu:22.04", 2, "linux/arm64", "3.10"], + # Bookworm is Debian 12 + ["python:3.8-bookworm", 2, "linux/amd64", "3.8"], + ["python:3.8-bookworm", 2, "linux/arm64", "3.8"], + ["python:3.9-bookworm", 2, "linux/amd64", "3.9"], + ["python:3.9-bookworm", 2, "linux/arm64", "3.9"], + ["python:3.10-bookworm", 2, "linux/amd64", "3.10"], + ["python:3.10-bookworm", 2, "linux/arm64", "3.10"], + ["python:3.11-bookworm", 2, "linux/amd64", "3.11"], + ["python:3.11-bookworm", 2, "linux/arm64", "3.11"], + ["python:3.12-bookworm", 2, "linux/amd64", "3.12"], + ["python:3.12-bookworm", 2, "linux/arm64", "3.12"], + ["amazonlinux:2023", 1, "linux/amd64", "3.9"], + ["redhat/ubi9", 1, "linux/amd64", "3.9"], + ] + fail-fast: false + env: + LINUX_DISTRO_CONTAINER_NAME: linux-distro + runs-on: ${{ matrix.test-case[2] == 'linux/amd64' && 'ubuntu-22.04' || 'aerospike_arm_runners_2' }} + steps: + # TODO: the checkout code is also duplicated in the macOS stage tests + # But it's only a few lines of code so I didn't bother to create a composite action for it. + - name: Get tests and Github action scripts + uses: actions/checkout@v4 + with: + ref: ${{ inputs.use_jfrog_builds && inputs.jfrog-build-version-to-test || github.sha }} + sparse-checkout: | + test + .github + + # Map test case tuple entries to env vars to make code easier to read + - run: echo "DISTRO_DOCKER_IMAGE_AND_TAG=${{ matrix.test-case[0] }}" >> $GITHUB_ENV + - run: echo "TEST_CATEGORY=${{ matrix.test-case[1] }}" >> $GITHUB_ENV + - run: echo "DISTRO_DOCKER_IMAGE_PLATFORM=${{ matrix.test-case[2] }}" >> $GITHUB_ENV + - run: echo "PYTHON_VERSION=${{ matrix.test-case[3] }}" >> $GITHUB_ENV + + - uses: ./.github/actions/get-artifact-for-stage-tests + with: + get_from_jfrog: ${{ inputs.use_jfrog_builds }} + # This input is only used if above input is true + jfrog_build_version: ${{ inputs.jfrog-build-version-to-test }} + dist_type_to_get: ${{ env.TEST_CATEGORY == '2' && 'wheel' || 'sdist' }} + # wheel* inputs are used only if running category 2 tests + wheel_python_version: ${{ env.PYTHON_VERSION }} + wheel_os: manylinux + wheel_cpu_arch: ${{ env.DISTRO_DOCKER_IMAGE_PLATFORM == 'linux/amd64' && 'x86_64' || 'aarch64' }} + JFROG_PLATFORM_URL: ${{ secrets.JFROG_PLATFORM_URL }} + JFROG_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }} + JFROG_REPO_NAME: ${{ vars.JFROG_REPO_NAME }} + + - uses: ./.github/actions/run-ee-server + with: + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Run distro container + # Run distro container on host network to access the Aerospike server using localhost (without having to change config.conf) + run: docker run --detach --network host --platform ${{ env.DISTRO_DOCKER_IMAGE_PLATFORM }} --name ${{ env.LINUX_DISTRO_CONTAINER_NAME }} ${{ env.DISTRO_DOCKER_IMAGE_AND_TAG }} tail -f /dev/null + + - name: Copy repo (and artifact) to container + run: docker cp . ${{ env.LINUX_DISTRO_CONTAINER_NAME }}:/aerospike-client-python + + - name: 'Amazon Linux 2023: install python 3.11 if applicable' + if: ${{ env.DISTRO_DOCKER_IMAGE_AND_TAG == 'amazonlinux:2023' && env.PYTHON_VERSION == '3.11' }} + run: docker exec ${{ env.LINUX_DISTRO_CONTAINER_NAME }} yum install -y python3.11 + + - name: 'Ubuntu 22.04 Install python 3.10 that comes by default (step 1)' + if: ${{ env.DISTRO_DOCKER_IMAGE_AND_TAG == 'ubuntu:22.04' }} + run: docker exec ${{ env.LINUX_DISTRO_CONTAINER_NAME }} apt update + + - name: 'Ubuntu 22.04 Install python 3.10 that comes by default (step 2)' + if: ${{ env.DISTRO_DOCKER_IMAGE_AND_TAG == 'ubuntu:22.04' }} + run: docker exec ${{ env.LINUX_DISTRO_CONTAINER_NAME }} apt install python3 python3-pip -y + + - name: Make sure pip is installed + if: ${{ env.DISTRO_DOCKER_IMAGE_AND_TAG == 'amazonlinux:2023' || env.DISTRO_DOCKER_IMAGE_AND_TAG == 'redhat/ubi9' || startsWith(env.DISTRO_DOCKER_IMAGE_AND_TAG, 'python') }} + run: docker exec ${{ env.LINUX_DISTRO_CONTAINER_NAME }} python${{ env.PYTHON_VERSION }} -m ensurepip + + - name: 'Cat 1: Install build dependencies using yum' + if: ${{ env.TEST_CATEGORY == '1' }} + run: docker exec ${{ env.LINUX_DISTRO_CONTAINER_NAME }} yum install -y openssl-devel glibc-devel autoconf automake libtool zlib-devel openssl-devel python-devel + + - name: 'Cat 1: Install pip build frontend' + if: ${{ env.TEST_CATEGORY == '1' }} + run: docker exec --workdir /aerospike-client-python/ ${{ env.LINUX_DISTRO_CONTAINER_NAME }} python${{ env.PYTHON_VERSION }} -m pip install -r requirements.txt + + - name: Install sdist or wheel distribution + run: docker exec --workdir /aerospike-client-python/ ${{ env.LINUX_DISTRO_CONTAINER_NAME }} python${{ env.PYTHON_VERSION }} -m pip install ${{ env.ARTIFACT_FILE_NAME_PATTERN }} + + - name: Install pytest + run: docker exec --workdir /aerospike-client-python/test ${{ env.LINUX_DISTRO_CONTAINER_NAME }} python${{ env.PYTHON_VERSION }} -m pip install pytest -c requirements.txt + + - name: Run tests + run: docker exec --workdir /aerospike-client-python/test ${{ env.LINUX_DISTRO_CONTAINER_NAME }} python${{ env.PYTHON_VERSION }} -m pytest new_tests/ + + macOS: + if: ${{ inputs.test-macos-x86 }} + strategy: + matrix: + runner-os: [ + macos-13, + macos-14-large + ] + python-version: [ + "3.8", + "3.9", + "3.10", + "3.11", + "3.12", + ] + fail-fast: false + runs-on: ${{ matrix.runner-os }} + steps: + - name: Get tests and Github action scripts + uses: actions/checkout@v4 + with: + ref: ${{ inputs.use_jfrog_builds && inputs.jfrog-build-version-to-test || github.sha }} + sparse-checkout: | + test + .github + + - uses: ./.github/actions/get-artifact-for-stage-tests + with: + # See comments in linux stage tests for how this works + get_from_jfrog: ${{ inputs.use_jfrog_builds }} + jfrog_build_version: ${{ inputs.jfrog-build-version-to-test }} + dist_type_to_get: 'wheel' + wheel_python_version: ${{ matrix.python-version }} + wheel_os: macosx + wheel_cpu_arch: x86_64 + JFROG_PLATFORM_URL: ${{ secrets.JFROG_PLATFORM_URL }} + JFROG_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }} + JFROG_REPO_NAME: ${{ vars.JFROG_REPO_NAME }} + + - uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + + - uses: ./.github/actions/setup-docker-on-macos + + - uses: ./.github/actions/run-ee-server + with: + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Install wheel + run: python3 -m pip install *.whl + + - name: Install test dependencies + run: python3 -m pip install pytest -c requirements.txt + working-directory: test + + - name: Run tests + run: python3 -m pytest new_tests/ + id: test + working-directory: test diff --git a/.github/workflows/test-server-rc.yml b/.github/workflows/test-server-rc.yml new file mode 100644 index 000000000..7bdc2f7c0 --- /dev/null +++ b/.github/workflows/test-server-rc.yml @@ -0,0 +1,170 @@ +name: Test cibuildwheel artifacts against server RC +run-name: Test cibuildwheel artifacts against server RC + +on: + workflow_call: + secrets: + DOCKER_HUB_BOT_USERNAME: + required: true + DOCKER_HUB_BOT_PW: + required: true + MAC_M1_SELF_HOSTED_RUNNER_PW: + required: true + +jobs: + manylinux: + strategy: + fail-fast: false + matrix: + # Python versions to build wheels on + nodejs: [ + ["18", "v108"], + ["20", "v115"], + ["22", "v127"], + ["23", "v131"], + ] + platform: [ + ["x86_64", "ubuntu-22.04"], + ["aarch64", "aerospike_arm_runners_2"] + ] + runs-on: ${{ matrix.platform[1] }} + steps: + - uses: actions/checkout@v4 + + - run: docker run -d --name manylinux quay.io/pypa/manylinux2014_${{ matrix.platform[0] }} tail -f /dev/null + + - uses: ./.github/actions/run-ee-server-for-ext-container + with: + use-server-rc: true + server-tag: latest + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - uses: actions/download-artifact@v4 + with: + name: ${{ matrix.nodejs[1] }}-manylinux_${{ matrix.platform[0] }}.build + path: ./ + + - name: Copy repo and wheel into manylinux container + run: docker cp ../aerospike-client-nodejs manylinux:/ + + - name: Install wheel + run: docker exec --workdir /aerospike-client-nodejs manylinux nodejs${{ matrix.nodejs[0] }} -m pip install *.whl + + - name: Install test prerequisites + run: docker exec --workdir /aerospike-client-nodejs/test manylinux nodejs${{ matrix.nodejs[0] }} -m pip install -r requirements.txt + + - name: Run tests + id: test + run: docker exec --workdir /aerospike-client-nodejs/test manylinux nodejs${{ matrix.nodejs[0] }} -m pytest new_tests/ + + macOS-x86: + # Skip macOS x86 testing since it's unstable + if: ${{ false }} + strategy: + fail-fast: false + matrix: + nodejs: [ + ["18", "v108"], + ["20", "v115"], + ["22", "v127"], + ["23", "v131"], + ] + runs-on: macos-12-large + steps: + - uses: actions/checkout@v4 + + - uses: ./.github/actions/setup-docker-on-macos + + - uses: ./.github/actions/run-ee-server + with: + use-server-rc: true + server-tag: latest + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - uses: actions/download-artifact@v4 + with: + name: ${{ matrix.nodejs[1] }}-macosx_x86_64.build + path: ./ + + - uses: actions/setup-nodejs@v4 + with: + nodejs-version: ${{ matrix.nodejs[0] }} + + - run: python${{ matrix.python[0] }} -m pip install *.whl + + - run: python${{ matrix.python[0] }} -m pip install -r requirements.txt + working-directory: test + + - run: python${{ matrix.python[0] }} -m pytest new_tests/ + id: test + working-directory: test + + macOS-m1: + # TODO: this shares a lot of steps as in the build wheels workflow + runs-on: [ + self-hosted, + macOS, + ARM64 + ] + strategy: + matrix: + python-version: [ + ["18", "v108"], + ["20", "v115"], + ["22", "v127"], + ["23", "v131"], + ] + fail-fast: false + steps: + - uses: actions/checkout@v4 + + - uses: actions/download-artifact@v4 + with: + name: ${{ matrix.nodejs-version[1] }}-macosx_arm64.build + path: ./ + + # Update dependencies if needed + - name: Add brew to path + run: echo PATH=$PATH:/opt/homebrew/bin/ >> $GITHUB_ENV + + # TODO: INSTALL NODEJS + - name: Install or upgrade Python + run: brew install python@${{ matrix.python-version[0] }} + + # Self-hosted runner only + # Need to be able to save Docker Hub credentials to keychain + - run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} + + - uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Run server RC + run: docker run -d -p 3000:3000 --name aerospike -e DEFAULT_TTL=2592000 ${{ vars.SERVER_RC_REPO_LINK }} + + - name: Create config.conf + run: cp config.conf.template config.conf + working-directory: test + + - name: Install wheel + run: python${{ matrix.nodejs-version[0] }} -m pip install --force-reinstall --break-system-packages *.whl + + - run: python${{ matrix.nodejs-version[0] }} -m pip install --force-reinstall --break-system-packages -r requirements.txt + working-directory: test + + - uses: ./.github/actions/wait-for-as-server-to-start + with: + container-name: aerospike + + - run: python${{ matrix.nodejs-version[0] }} -m pytest new_tests/ + id: test + working-directory: test + + - name: Stop server + if: ${{ always() }} + run: | + docker container stop aerospike + docker container prune -f diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml new file mode 100644 index 000000000..ce155ed1e --- /dev/null +++ b/.github/workflows/update-version.yml @@ -0,0 +1,64 @@ +# Takes in a new version as input +# Changes the version in the whole repo and outputs the commit hash as output + +name: Update version in repo +on: + workflow_dispatch: + inputs: + new_version: + type: string + description: Version string to set in the repo + required: true + workflow_call: + inputs: + new_version: + type: string + description: Version string to set in the repo + required: true + ref: + type: string + description: commit/branch to change version + required: false + # A hack to tell if workflow is triggered by workflow_call or not + # Calling workflows should not set this input + # If workflow is triggered by workflow_dispatch, this should be set to the default boolean value: false + # https://github.com/actions/runner/discussions/1884#discussioncomment-6377587 + is_workflow_call: + type: boolean + default: true + required: false + secrets: + CLIENT_BOT_PAT: + required: true + outputs: + bump_sha: + value: ${{ jobs.update-version-in-repo.outputs.bump_sha }} + +jobs: + update-version-in-repo: + name: Update version in repo + runs-on: ubuntu-22.04 + outputs: + bump_sha: ${{ steps.get-bump-commit-sha.outputs.bump_sha }} + steps: + - uses: actions/checkout@v4 + with: + token: ${{ secrets.CLIENT_BOT_PAT }} + ref: ${{ inputs.ref }} + + - name: Update version in repo + uses: ./.github/actions/update-version + with: + new_version: ${{ inputs.new_version }} + + - name: Commit new version + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: 'Auto-bump version to ${{ inputs.new_version }} [skip ci]' + commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + tagging_message: ${{ inputs.new_version }} + branch: ${{ inputs.is_workflow_call && inputs.ref || github.ref }} + + - name: Output bump commit hash for next jobs to use + id: get-bump-commit-sha + run: echo "bump_sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml new file mode 100644 index 000000000..5de0ada8a --- /dev/null +++ b/.github/workflows/upload-to-jfrog.yml @@ -0,0 +1,52 @@ +name: Upload to JFrog + +on: + workflow_call: + inputs: + version: + type: string + required: false + jfrog-repo-name: + type: string + required: false + default: ${{ vars.JFROG_REPO_NAME }} + secrets: + JFROG_PLATFORM_URL: + required: true + JFROG_ACCESS_TOKEN: + required: true + +jobs: + upload-to-jfrog: + name: Upload artifacts to JFrog + runs-on: ubuntu-22.04 + steps: + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + pattern: '*.node' + merge-multiple: true + path: artifacts + + - name: Set up JFrog credentials + uses: jfrog/setup-jfrog-cli@v3 + env: + JF_URL: ${{ secrets.JFROG_PLATFORM_URL }} + JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }} + + - name: Upload manylinux builds from arbitrary branches to JFrog generic repo + if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} + run: jf rt upload "*manylinux*" ${{ vars.JFROG_GENERIC_REPO_NAME }}/${{ github.ref_name }}/ + working-directory: artifacts + + - name: Upload passing builds to JFrog Nodejs repo + if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} + # Source path must be in quotes if it contains an asterisk + # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 + run: jf rt upload --build-name nodejs-client --build-number $NEW_VERSION "artifacts/*" ${{ vars.JFROG_REPO_NAME }}/aerospike/$NEW_VERSION/ + env: + NEW_VERSION: ${{ inputs.version }} + + - name: Publish build info + if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} + run: jf rt build-publish nodejs-client ${{ inputs.version }} diff --git a/.github_former/actions/run-ee-server/action.yml b/.github_former/actions/run-ee-server/action.yml new file mode 100644 index 000000000..f7d4379fb --- /dev/null +++ b/.github_former/actions/run-ee-server/action.yml @@ -0,0 +1,62 @@ +name: 'Run EE Server' +description: 'Run EE server' +inputs: + # All inputs in composite actions are strings + use-server-rc: + required: true + default: false + server-tag: + required: true + default: 'latest' + # Github Composite Actions can't access secrets + # so we need to pass them in as inputs + docker-hub-username: + required: false + docker-hub-password: + required: false + +runs: + using: "composite" + steps: + - name: Create config folder to store configs in + run: mkdir configs + shell: bash + + - name: Use release server + if: ${{ inputs.use-server-rc == 'false' }} + run: echo "SERVER_IMAGE=aerospike/aerospike-server-enterprise" >> $GITHUB_ENV + shell: bash + + - name: Use release candidate server + if: ${{ inputs.use-server-rc == 'true' }} + run: echo "SERVER_IMAGE=aerospike/aerospike-server-enterprise-rc" >> $GITHUB_ENV + shell: bash + + - name: Log into Docker Hub to get server RC + if: ${{ inputs.use-server-rc == 'true' }} + run: docker login --username ${{ inputs.docker-hub-username }} --password ${{ inputs.docker-hub-password }} + shell: bash + + - name: Get default aerospike.conf from Docker server EE container + run: | + docker run -d --name aerospike -p 3000-3002:3000-3002 $SERVER_IMAGE:${{ inputs.server-tag }} + sleep 5 + docker cp aerospike:/etc/aerospike/aerospike.conf ./configs/aerospike.conf + docker container stop aerospike + docker container rm aerospike + shell: bash + + - name: Enable security features using aerospike.conf + # Security stanza + run: echo -e "security {\n\tenable-quotas true\n}\n" >> ./aerospike.conf + working-directory: ./configs + shell: bash + + - name: Run enterprise edition server + run: docker run -tid -v $(pwd)/configs:/opt/aerospike/etc -p 3000:3000 --name aerospike $SERVER_IMAGE:${{ inputs.server-tag }} asd --config-file /opt/aerospike/etc/aerospike.conf + shell: bash + + - name: Create user in database for tests + # Use default admin user to create another user for testing + run: docker exec aerospike asadm --user admin --password admin --enable -e "manage acl create user superuser password superuser roles read-write-udf sys-admin user-admin data-admin" + shell: bash \ No newline at end of file diff --git a/.github/assets/aerospike.conf b/.github_former/assets/aerospike.conf similarity index 100% rename from .github/assets/aerospike.conf rename to .github_former/assets/aerospike.conf diff --git a/.github_former/workflows/build-bindings.yml b/.github_former/workflows/build-bindings.yml new file mode 100644 index 000000000..337c7f3ed --- /dev/null +++ b/.github_former/workflows/build-bindings.yml @@ -0,0 +1,599 @@ +name: Build binding +run-name: Build bindings (run_tests=${{ inputs.run_tests }}, use-server-rc=${{ inputs.use-server-rc }}, server-tag=${{ inputs.server-tag }}) + +# Builds manylinux bindings and source distribution +# If running tests, publish results in commit status +# Publishes bindings and source distribution on Github Actions if no tests are run or tests pass + +on: + push: + branches: ["stage", "master"] + pull_request: + branches: ["stage", "master"] + types: [ + # Default triggers + opened, + synchronize, + reopened, + # Additional triggers + labeled, + unlabeled + ] + inputs: + # If we only want to check that the builds pass on an arbitrary branch + run_tests: + description: "Run integration tests" + required: true + type: boolean + default: true + use-server-rc: + type: boolean + required: true + default: false + description: 'Test against server release candidate?' + # If we are creating a backport and want to test an arbitrary branch against an older server version + server-tag: + required: true + default: 'latest' + description: 'Server docker image tag' + workflow_call: + inputs: + # The dev tests test the artifacts against a server release + # The stage tests and release workflow only need to build the artifacts + run_tests: + description: "Run integration tests" + required: true + type: boolean + default: true + commit_sha: + type: string + required: false + # Calling workflow doesn't actually use these 2 options + # But we need to set default values for workflow calls + use-server-rc: + required: false + default: true + type: boolean + server-tag: + type: string + required: false + default: 'latest' + secrets: + DOCKER_HUB_BOT_USERNAME: + required: false + DOCKER_HUB_BOT_PW: + required: false + MAC_M1_SELF_HOSTED_RUNNER_PW: + required: false + workflow_dispatch: + inputs: + # If we only want to check that the builds pass on an arbitrary branch + run_tests: + description: "Run integration tests" + required: true + type: boolean + default: true + use-server-rc: + type: boolean + required: true + default: false + description: 'Test against server release candidate?' + # If we are creating a backport and want to test an arbitrary branch against an older server version + server-tag: + required: true + default: 'latest' + description: 'Server docker image tag' + +jobs: + manylinux: + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + # nodejs versions to build bindings on + nodejs: [ + ["v108", 18], + ["v115", 20], + ["v127", 22], + ["v131", 23] + ] + platform: [ + "x86_64", + #"aarch64" + ] + + steps: + + - name: Show job status for commit + uses: myrotvorets/set-commit-status-action@v2.0.0 + with: + sha: ${{ github.sha }} + context: "Build bindings (${{ matrix.nodejs[0] }}-manylinux_${{ matrix.platform }})" + + - uses: actions/checkout@v4 + with: + submodules: recursive + ref: ${{ inputs.commit_sha }} + + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.nodejs[1] }} + architecture: 'x64' + + - name: print + run: uname -m + + - name: Set up QEMU for cross compiling arm64 + if: ${{ matrix.platform == 'aarch64' }} + uses: docker/setup-qemu-action@v3 + with: + platforms: all + + - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + + - name: Run Aerospike server release candidate with latest tag + if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest + + - name: Run Aerospike server + if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: | + npm i @types/mocha @types/yargs @types/semver @types/chai; + docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/mail/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file /etc/mail/aerospike.conf + +# - name: Set config.conf to use Docker IP address of Aerospike server +# # config.conf should be copied into the cibuildwheel Docker container +# run: | +# export SERVER_DOCKER_IP=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) +# # Install crudini +# pip install crudini -c ../.github/workflows/requirements.txt +# sed -i "s/127.0.0.1:3000//" config.conf +# crudini --set config.conf enterprise-edition hosts ${SERVER_DOCKER_IP}:3000 +# working-directory: test + + - name: Enable tests + run: echo "TEST_COMMAND=cd ts-test; + npm install typescript --save-dev; + npx tsc; + cd ..; + npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV + +# - name: Disable tests (only run basic import test) +# if: ${{ !inputs.run_tests }} +# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV + + - uses: uraimo/run-on-arch-action@v2 + name: Build client arm + if: ${{ matrix.platform == 'aarch64' }} + id: runcmd + with: + arch: aarch64 + distro: ubuntu-22.04 + + # Set an output parameter `uname` for use in subsequent steps + run: | + apt update + apt install -y g++ libssl-dev zlib1g-dev make build-essential libuv1-dev wget curl + ./scripts/build-c-client.sh + wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash; + source ~/.bashrc; + nvm i 22 + npm install + + - name: Build client x64 + if: ${{ matrix.platform != 'aarch64' }} + run: | + sudo apt update + sudo apt install g++ libssl-dev zlib1g-dev; + sudo apt-get install -y make; + sudo apt install build-essential; + ./scripts/build-c-client.sh + npm install + env: + CFLAGS: '-Werror' + + - name: Test client + run: | + ${{ env.TEST_COMMAND }} + + - name: Send binding to test jobs + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.nodejs[0] }}-manylinux_${{ matrix.platform }}.build + path: ./lib/binding/node-*-linux-*/ + + - name: Set final commit status + uses: myrotvorets/set-commit-status-action@v2.0.0 + if: always() + with: + sha: ${{ github.sha }} + status: ${{ job.status }} + context: "Build bindings (${{ matrix.nodejs[0] }}-manylinux_${{ matrix.platform }})" + + macOS-x86: + strategy: + fail-fast: false + matrix: + nodejs: [ + ["v108", 18], + ["v115", 20], + ["v127", 22], + ['v131', 23] + ] + runs-on: macos-13 + steps: + - name: Show job status for commit + uses: myrotvorets/set-commit-status-action@v2.0.0 + with: + sha: ${{ github.sha }} + context: "Build bindings (${{ matrix.nodejs[0] }}-macosx_x86_64)" + + - uses: actions/checkout@v4 + with: + submodules: recursive + ref: ${{ inputs.commit_sha }} + + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.nodejs[1] }} + architecture: 'x64' + +# - name: Install Docker Engine +# run: brew install colima +# +# - name: Install Docker client +# run: brew install docker +# +# - name: Start Docker Engine +# run: colima start +# +# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} +# password: ${{ secrets.DOCKER_HUB_BOT_PW }} +# +# - name: Run Aerospike server release candidate with latest tag +# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest +# +# - name: Run Aerospike server +# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server +# +# - name: Enable tests +# run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000 --t 30000" >> $GITHUB_ENV + +# - name: Disable tests (only run basic import test) +# if: ${{ !inputs.run_tests }} +# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV + + - name: Build client + run: | + ./scripts/build-c-client.sh + npm install + env: + CFLAGS: '-Werror' + +# - name: Test client +# run: | +# ${{ env.TEST_COMMAND }} + + - name: Save macOS binding + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.nodejs[0] }}-macosx_x86_64.build + path: ./lib/binding/*/ + + - name: Set final commit status + uses: myrotvorets/set-commit-status-action@v2.0.0 + if: always() + with: + status: ${{ job.status }} + sha: ${{ github.sha }} + context: "Build bindings (${{ matrix.nodejs[0] }}-macosx_x86_64)" + +# macOS-m1: +# runs-on: [ +# self-hosted, +# macOS, +# ARM64 +# ] +# strategy: +# matrix: +# nodejs-version: [ +# ["v108", "18"], +# ["v115", "20"], +# ["v127", 22] +# ] +# fail-fast: false +# steps: +# - name: Show job status for commit +# uses: myrotvorets/set-commit-status-action@v2.0.0 +# with: +# sha: ${{ github.sha }} +# context: "Build bindings (${{ matrix.nodejs-version[1] }}-macosx_arm64)" +# +# - uses: actions/checkout@v4 +# with: +# submodules: recursive +# ref: ${{ inputs.commit_sha }} +# +# - name: Install NVM +# run: | +# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash +# source ~/.zshrc +# nvm -v +# nvm install ${{ matrix.nodejs-version[1] }} +# +# +# - name: Setup symlink folders +# run: | +# sudo rm -rf /usr/local/opt/openssl; +# sudo rm -rf /usr/local/opt/libuv; +# sudo mkdir -p /usr/local/opt; +# sudo chown -R $(whoami) /usr/local/opt +# +# - name: Install brew packages +# run: | +# brew install openssl@3.2.1 +# brew install libuv@1.47.0 +# +# - name: Set environment for building +# run: | +# echo "export PATH="/usr/local/bin/:/usr/local/opt/openssl/bin:$PATH" +# export LDFLAGS="-L/usr/local/opt/openssl/lib" +# export CPPFLAGS="-I/usr/local/opt/openssl/include" +# export EXT_CFLAGS="-I/usr/local/opt/openssl/include"" >> ~/.zshrc; +# source ~/.zshrc; +# +# - name: Setup symlink folders +# run: | +# sudo ln -s /usr/local/Cellar/libuv/1.47.0/ /usr/local/opt/libuv; +# sudo ln -s /usr/local/Cellar/openssl@3/3.2.1/ /usr/local/opt/openssl; +# +# # Self-hosted runner only +# # Need to be able to save Docker Hub credentials to keychain +# - run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} +# if: ${{ inputs.run_tests && inputs.use-server-rc }} +# +# - if: ${{ inputs.run_tests && inputs.use-server-rc }} +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} +# password: ${{ secrets.DOCKER_HUB_BOT_PW }} +# +# - name: Use server rc +# if: ${{ inputs.run_tests && inputs.use-server-rc }} +# run: echo IMAGE_NAME="${{ vars.SERVER_RC_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV +# +# - name: Use server release +# if: ${{ inputs.run_tests && !inputs.use-server-rc }} +# run: echo IMAGE_NAME="${{ vars.SERVER_REPO_LINK }}:${{ inputs.server-tag }}" >> $GITHUB_ENV +# +# - name: Run server +# if: ${{ inputs.run_tests }} +# run: docker run -d -p 3000:3000 --name aerospike ${{ env.IMAGE_NAME }} +# +# - name: Build client +# run: | +# ./scripts/build-c-client.sh +# npm install +# env: +# CFLAGS: '-Werror' +# +# - name: Enable tests +# if: ${{ inputs.run_tests }} +# run: echo "TEST_COMMAND=npm test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV +# +# - name: Disable tests (only run basic import test) +# if: ${{ !inputs.run_tests }} +# run: echo "TEST_COMMAND=node -e 'aerospike = require(\".\/lib\/aerospike\")'" >> $GITHUB_ENV +# +# +# - name: Test client +# run: | +# ${{ env.TEST_COMMAND }} +# +# - name: Save macOS wheel +# uses: actions/upload-artifact@v4 +# with: +# name: ${{ matrix.nodejs-version[0] }}-macosx_arm64.build +# path: ./lib/binding/*/ +# +# - name: Stop server +# if: ${{ always() && inputs.run_tests }} +# run: | +# docker container stop aerospike +# docker container prune -f +# +# - name: Set final commit status +# uses: myrotvorets/set-commit-status-action@v2.0.0 +# if: always() +# with: +# sha: ${{ github.sha }} +# status: ${{ job.status }} +# context: "Build bindings (${{ matrix.nodejs-version[0] }}-macosx_arm64)" + + test-npm-install: + runs-on: ubuntu-22.04 + needs: [manylinux, macOS-x86] + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: ./.github/workflows/combine-bindings/ + + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + architecture: 'x64' + + - name: Modify the package.json + run: | + sudo npm install -g json + + + - name: Modify the package.json + run: | + sudo npm install -g json + json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + + - name: Run tests + run: | + mkdir -p testDir + cd testDir + pwd + sudo npm install .. + + test-yarn-install: + runs-on: ubuntu-22.04 + needs: [manylinux, macOS-x86] + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: ./.github/workflows/combine-bindings/ + + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + architecture: 'x64' + + - name: Modify the package.json + run: | + sudo npm install -g json + json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + + - name: Run tests + run: | + mkdir -p testDir + yarn link + cd testDir + npm install --global yarn + yarn add link:.. + + test-pnpm-install: + runs-on: ubuntu-22.04 + needs: [manylinux, macOS-x86] + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: ./.github/workflows/combine-bindings/ + + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + architecture: 'x64' + + - name: Modify the package.json + run: | + sudo npm install -g json + json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + + - name: Run tests + run: | + mkdir -p testDir + cd testDir + npm install --global pnpm + SHELL=bash pnpm setup + source /home/runner/.bashrc + pnpm install .. + + test-bun-install: + runs-on: ubuntu-latest + needs: [manylinux, macOS-x86] + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: ./.github/workflows/combine-bindings/ + + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + architecture: 'x64' + + - name: Modify the package.json + run: | + sudo npm install -g json + json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + + - name: Run tests + run: | + npm install -g bun + bun link + mkdir -p testDir + cd testDir + bun link aerospike + +# test-typescript-install: +# runs-on: ubuntu-22.04 +# needs: [manylinux, macOS-x86] +# steps: +# - uses: actions/checkout@v2 +# with: +# submodules: recursive +# +# - uses: ./.github/workflows/combine-bindings/ +# +# - uses: actions/setup-node@v4 +# with: +# node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} +# architecture: 'x64' +# +# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} +# password: ${{ secrets.DOCKER_HUB_BOT_PW }} +# +# +# - name: Run Aerospike server release candidate with latest tag +# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest +# +# - name: Run Aerospike server +# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# run: | +# cd ts-test; +# npm i --save-dev @types/mocha; +# npm i --save-dev @types/yargs; +# npm i --save-dev @types/semver; +# npm i --save-dev @types/chai; +# tsc; +# cd ..; +# npm install; +# docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server +# +# +# +# - name: Wait for database to be ready +# # Should be ready after 3 seconds +# run: sleep 15 +# +# - name: Modify the package.json +# run: | +# sudo npm install -g json +# json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" +# +# - name: Run tests +# run: | +# mkdir my-aerospike-project +# cd my-aerospike-project +# npm init -y +# npm install typescript ts-node --save-dev +# npm install .. +# cp ../examples/typescript.ts index.ts +# npx tsc index.ts +# node index.js \ No newline at end of file diff --git a/.github/workflows/codeql.yml b/.github_former/workflows/codeql.yml similarity index 100% rename from .github/workflows/codeql.yml rename to .github_former/workflows/codeql.yml diff --git a/.github/workflows/combine-bindings/action.yml b/.github_former/workflows/combine-bindings/action.yml similarity index 100% rename from .github/workflows/combine-bindings/action.yml rename to .github_former/workflows/combine-bindings/action.yml diff --git a/.github/workflows/tests.yml b/.github_former/workflows/tests.yml similarity index 100% rename from .github/workflows/tests.yml rename to .github_former/workflows/tests.yml diff --git a/.github/workflows/windows-build.yml b/.github_former/workflows/windows-build.yml similarity index 100% rename from .github/workflows/windows-build.yml rename to .github_former/workflows/windows-build.yml From 4bb99106f4473dae8fe26f3f7b4a8f75a43e2157 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 15 Nov 2024 08:36:08 -0700 Subject: [PATCH 002/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 338e73528..d68ef14eb 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -307,7 +307,7 @@ jobs: - name: Download wheel uses: actions/download-artifact@v4 with: - name: ${{ env.BUILD_IDENTIFIER }}.build + name: ${{ env.BUILD_IDENTIFIER }}.node - name: Convert Python tag to Python version # Don't use sed because we want this command to work on both mac and windows From e7987d2e6243251b756c8c5b1a68f581238870b6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 15 Nov 2024 08:44:40 -0700 Subject: [PATCH 003/417] Update dev-workflow-p1.yml --- .github/workflows/dev-workflow-p1.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 7dbd6527b..af9feb0a1 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -10,6 +10,7 @@ on: - review_requested branches: - 'dev*' + - 'dev-CICD' paths-ignore: - 'docs/**' - 'aerospike-stubs/**' From aeab532600329933a724f5eb6a4db707e1e62dc6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 15 Nov 2024 08:45:23 -0700 Subject: [PATCH 004/417] Update dev-workflow-p1.yml --- .github/workflows/dev-workflow-p1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index af9feb0a1..285b870b0 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -10,7 +10,7 @@ on: - review_requested branches: - 'dev*' - - 'dev-CICD' + - '2024-Pipeline-Improvement' paths-ignore: - 'docs/**' - 'aerospike-stubs/**' From eea68a5ea51a2f87c77784cfb881a5bc621d2f6c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 15 Nov 2024 08:53:27 -0700 Subject: [PATCH 005/417] Update dev-workflow-p1.yml --- .github/workflows/dev-workflow-p1.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 285b870b0..f79144fea 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -7,6 +7,7 @@ name: Dev workflow (part 1) on: pull_request: types: + - opened - review_requested branches: - 'dev*' From cd8aefe03484735fc44e429b5c8d79684cd84770 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 15 Nov 2024 09:25:28 -0700 Subject: [PATCH 006/417] Update dev-workflow-p1.yml --- .github/workflows/dev-workflow-p1.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index f79144fea..daee8c110 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -11,6 +11,7 @@ on: - review_requested branches: - 'dev*' + - 'dev-CICD' - '2024-Pipeline-Improvement' paths-ignore: - 'docs/**' From e1c0dc43033acca9028a5b861cfb73dfab8de875 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Sat, 16 Nov 2024 07:00:11 -0700 Subject: [PATCH 007/417] Update dev-workflow-p2.yml --- .github/workflows/dev-workflow-p2.yml | 86 +++++++++++++-------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 7427ec970..31a345b6b 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -1,43 +1,43 @@ -name: Dev workflow (part 2) - -on: - pull_request_target: - branches: - - 'dev*' - types: - - closed - workflow_dispatch: - -jobs: - bump-dev-number: - if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit - - rebuild-artifacts-with-new-dev-num: - needs: bump-dev-number - name: Rebuild artifacts with new dev number - uses: ./.github/workflows/build-artifacts.yml - with: - # On pull_request_target, the bump version commit will be ignored - # So we must pass it manually to the workflow - sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} - secrets: inherit - - upload-to-jfrog: - name: Upload artifacts to JFrog - needs: [ - bump-dev-number, - rebuild-artifacts-with-new-dev-num - ] - uses: ./.github/workflows/upload-to-jfrog.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit - - # We don't want the artifacts in JFrog to also exist in Github - delete-artifacts: - needs: upload-to-jfrog - uses: ./.github/workflows/delete-artifacts.yml +#name: Dev workflow (part 2) +# +#on: +# pull_request_target: +# branches: +# - 'dev*' +# types: +# - closed +# workflow_dispatch: +# +#jobs: +# bump-dev-number: +# if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit +# +# rebuild-artifacts-with-new-dev-num: +# needs: bump-dev-number +# name: Rebuild artifacts with new dev number +# uses: ./.github/workflows/build-artifacts.yml +# with: +# # On pull_request_target, the bump version commit will be ignored +# # So we must pass it manually to the workflow +# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} +# secrets: inherit +# +# upload-to-jfrog: +# name: Upload artifacts to JFrog +# needs: [ +# bump-dev-number, +# rebuild-artifacts-with-new-dev-num +# ] +# uses: ./.github/workflows/upload-to-jfrog.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit +# +# # We don't want the artifacts in JFrog to also exist in Github +# delete-artifacts: +# needs: upload-to-jfrog +# uses: ./.github/workflows/delete-artifacts.yml From fe74d74c47c96ae2cd54898151f062c12d0d9ec4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Sat, 16 Nov 2024 07:04:56 -0700 Subject: [PATCH 008/417] Delete dev-workflow-p2.yml --- .github/workflows/dev-workflow-p2.yml | 43 --------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .github/workflows/dev-workflow-p2.yml diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml deleted file mode 100644 index 31a345b6b..000000000 --- a/.github/workflows/dev-workflow-p2.yml +++ /dev/null @@ -1,43 +0,0 @@ -#name: Dev workflow (part 2) -# -#on: -# pull_request_target: -# branches: -# - 'dev*' -# types: -# - closed -# workflow_dispatch: -# -#jobs: -# bump-dev-number: -# if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} -# uses: ./.github/workflows/bump-version.yml -# with: -# change: 'bump-dev-num' -# secrets: inherit -# -# rebuild-artifacts-with-new-dev-num: -# needs: bump-dev-number -# name: Rebuild artifacts with new dev number -# uses: ./.github/workflows/build-artifacts.yml -# with: -# # On pull_request_target, the bump version commit will be ignored -# # So we must pass it manually to the workflow -# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} -# secrets: inherit -# -# upload-to-jfrog: -# name: Upload artifacts to JFrog -# needs: [ -# bump-dev-number, -# rebuild-artifacts-with-new-dev-num -# ] -# uses: ./.github/workflows/upload-to-jfrog.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit -# -# # We don't want the artifacts in JFrog to also exist in Github -# delete-artifacts: -# needs: upload-to-jfrog -# uses: ./.github/workflows/delete-artifacts.yml From f181bb15dc8946320cc10f98db583a8a35e21e28 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 07:53:24 -0700 Subject: [PATCH 009/417] Pipeline improvements --- .../action.yml | 37 +++++++++++++++++++ .github/workflows/build-bindings.yml | 31 ++++++++++------ 2 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 .github/actions/run-ee-server-for-ext-container/action.yml diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml new file mode 100644 index 000000000..42e8b53a9 --- /dev/null +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -0,0 +1,37 @@ +name: 'Run EE server for another Docker container' +description: 'Run EE server and configure tests to connect to it from another Docker container' +inputs: + # All inputs in composite actions are strings + use-server-rc: + required: true + default: false + server-tag: + required: true + default: 'latest' + # Github Composite Actions can't access secrets + # so we need to pass them in as inputs + docker-hub-username: + required: false + docker-hub-password: + required: false + +runs: + using: "composite" + steps: + - name: Run EE server + uses: ./.github/actions/run-ee-server + with: + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + docker-hub-username: ${{ inputs.docker-hub-username }} + docker-hub-password: ${{ inputs.docker-hub-password }} + + - name: Get IP address of Docker container hosting server + id: get-server-ip-address + run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT + shell: bash + + - name: Configure tests to connect to that Docker container + run: crudini --existing=param --set config.conf enterprise-edition hosts ${{ steps.get-server-ip-address.outputs.server-ip }}:3000 + working-directory: test + shell: bash diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index d68ef14eb..3ce2695b3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -34,10 +34,10 @@ on: required: true options: - manylinux_x86_64 - - manylinux_aarch64 + #- manylinux_aarch64 - macosx_x86_64 - - macosx_arm64 - - win_amd64 + #- macosx_arm64 + #- win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: @@ -212,14 +212,14 @@ jobs: # run: echo "TEST_COMMAND=python -c \"import aerospike\"" >> $GITHUB_ENV # shell: bash - - name: Otherwise, enable integration tests - if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' }} - run: echo "TEST_COMMAND=cd ts-test; - npm install typescript --save-dev; - npx tsc; - cd ..; - npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV - shell: bash + #- name: Otherwise, enable integration tests + # if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' }} + # run: echo "TEST_COMMAND=cd ts-test; + # npm install typescript --save-dev; + # npx tsc; + # cd ..; + # npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV + # shell: bash - name: Set unoptimize flag if: ${{ inputs.unoptimized && (startsWith(inputs.platform-tag, 'manylinux') || startsWith(inputs.platform-tag, 'macosx')) }} @@ -234,6 +234,15 @@ jobs: ./scripts/build-c-client.sh; npm install; + - name: Run tests + if: ${{ inputs.run_tests}} + run: | + cd ts-test; + npm install typescript --save-dev; + npx tsc; + cd ..; + npm run test dist/ -- --h 127.0.0.1 --port 3000; + # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel # uses: pypa/cibuildwheel@v2.20.0 From 2c78b410d804628c52a20c5862895fa089f934c9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 08:06:04 -0700 Subject: [PATCH 010/417] Update dev-workflow-p1.yml --- .github/workflows/dev-workflow-p1.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index daee8c110..77a0f5181 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -9,6 +9,7 @@ on: types: - opened - review_requested + - synchronize branches: - 'dev*' - 'dev-CICD' From ee794652e0b42efca834f928c385eec747f0407c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 08:10:32 -0700 Subject: [PATCH 011/417] Update test-server-rc.yml --- .github/workflows/test-server-rc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-server-rc.yml b/.github/workflows/test-server-rc.yml index 7bdc2f7c0..6428684a2 100644 --- a/.github/workflows/test-server-rc.yml +++ b/.github/workflows/test-server-rc.yml @@ -25,7 +25,7 @@ jobs: ] platform: [ ["x86_64", "ubuntu-22.04"], - ["aarch64", "aerospike_arm_runners_2"] + #["aarch64", "aerospike_arm_runners_2"] ] runs-on: ${{ matrix.platform[1] }} steps: From da4b02c2d749df0836e7539cfb3fa08e9484dc66 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 08:13:19 -0700 Subject: [PATCH 012/417] Update build-bindings.yml --- .github_former/workflows/build-bindings.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github_former/workflows/build-bindings.yml b/.github_former/workflows/build-bindings.yml index 337c7f3ed..c94c6559c 100644 --- a/.github_former/workflows/build-bindings.yml +++ b/.github_former/workflows/build-bindings.yml @@ -146,15 +146,15 @@ jobs: npm i @types/mocha @types/yargs @types/semver @types/chai; docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/mail/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file /etc/mail/aerospike.conf -# - name: Set config.conf to use Docker IP address of Aerospike server -# # config.conf should be copied into the cibuildwheel Docker container -# run: | -# export SERVER_DOCKER_IP=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) -# # Install crudini -# pip install crudini -c ../.github/workflows/requirements.txt -# sed -i "s/127.0.0.1:3000//" config.conf -# crudini --set config.conf enterprise-edition hosts ${SERVER_DOCKER_IP}:3000 -# working-directory: test + - name: Set config.conf to use Docker IP address of Aerospike server + # config.conf should be copied into the cibuildwheel Docker container + run: | + export SERVER_DOCKER_IP=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) + # Install crudini + pip install crudini -c ../.github/workflows/requirements.txt + sed -i "s/127.0.0.1:3000//" config.conf + crudini --set config.conf enterprise-edition hosts ${SERVER_DOCKER_IP}:3000 + working-directory: test - name: Enable tests run: echo "TEST_COMMAND=cd ts-test; From ae2236d84c0136c56d2576295f2103cdf2f37f2d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 08:34:09 -0700 Subject: [PATCH 013/417] Update build-artifacts.yml --- .github/workflows/build-artifacts.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 8a90cae06..e306fc296 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -86,10 +86,10 @@ jobs: matrix: platform-tag: [ "manylinux_x86_64", - "manylinux_aarch64", + #"manylinux_aarch64", "macosx_x86_64", - "macosx_arm64", - "win_amd64" + #"macosx_arm64", + #"win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml From 9969f5a15f9866408ed37b36c28df9be8c7ed9d2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 08:38:12 -0700 Subject: [PATCH 014/417] Update action.yml --- .github/actions/run-ee-server-for-ext-container/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index 42e8b53a9..a45412af4 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -32,6 +32,8 @@ runs: shell: bash - name: Configure tests to connect to that Docker container - run: crudini --existing=param --set config.conf enterprise-edition hosts ${{ steps.get-server-ip-address.outputs.server-ip }}:3000 + run: | + pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; + crudini --existing=param --set config.conf enterprise-edition hosts ${{ steps.get-server-ip-address.outputs.server-ip }}:3000; working-directory: test shell: bash From 302138febb5a1f9a5d24a60592d07bad38d664f3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 08:52:53 -0700 Subject: [PATCH 015/417] pipeline improvements --- .github/actions/run-ee-server/action.yml | 21 +++++++++++++++++++++ .github/workflows/config.conf.template | 7 +++++++ .github/workflows/requirements.txt | 4 ++++ 3 files changed, 32 insertions(+) create mode 100644 .github/workflows/config.conf.template create mode 100644 .github/workflows/requirements.txt diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index f7d4379fb..3cdb53d24 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -18,6 +18,27 @@ inputs: runs: using: "composite" steps: + + - name: Install crudini to manipulate config.conf + # This will only work on the Github hosted runners. + run: pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt" + working-directory: .github/workflows + shell: bash + + - name: Create config.conf + run: cp config.conf.template config.conf + working-directory: .github/workflows + shell: bash + + - name: Use enterprise edition instead of community edition in config.conf + run: | + crudini --existing=param --set config.conf enterprise-edition hosts '' + crudini --existing=param --set config.conf enterprise-edition hosts 127.0.0.1:3000 + crudini --existing=param --set config.conf enterprise-edition user superuser + crudini --existing=param --set config.conf enterprise-edition password superuser + working-directory: .github/workflows + shell: bash + - name: Create config folder to store configs in run: mkdir configs shell: bash diff --git a/.github/workflows/config.conf.template b/.github/workflows/config.conf.template new file mode 100644 index 000000000..e9fd3924a --- /dev/null +++ b/.github/workflows/config.conf.template @@ -0,0 +1,7 @@ +[community-edition] +hosts: 127.0.0.1:3000 + +[enterprise-edition] +hosts : +user : +password : diff --git a/.github/workflows/requirements.txt b/.github/workflows/requirements.txt new file mode 100644 index 000000000..5099e0d6f --- /dev/null +++ b/.github/workflows/requirements.txt @@ -0,0 +1,4 @@ +parver==0.5 +crudini==0.9.4 +delocate==0.10.4 +mypy==1.10.0 From 0e402c5a1969da8a6cba8c0ebc53f1cc9426ac8b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 14:24:59 -0700 Subject: [PATCH 016/417] pipeline improvmements --- .github/actions/run-ee-server-for-ext-container/action.yml | 2 +- .github/workflows/build-bindings.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index a45412af4..3aa0e4f6c 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -35,5 +35,5 @@ runs: run: | pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; crudini --existing=param --set config.conf enterprise-edition hosts ${{ steps.get-server-ip-address.outputs.server-ip }}:3000; - working-directory: test + working-directory: .github/workflows shell: bash diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3ce2695b3..ae91cfbd9 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -343,7 +343,7 @@ jobs: run: | $env:DOCKER_HOST_IP = $env:DOCKER_HOST | foreach {$_.replace("tcp://","")} | foreach {$_.replace(":2375", "")} crudini --set config.conf enterprise-edition hosts ${env:DOCKER_HOST_IP}:3000 - working-directory: test + working-directory: ./github/workflows # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - run: | From 3ff3b1ede44cacc52a039ff2c6d1f9a26d061d26 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 14:42:42 -0700 Subject: [PATCH 017/417] Update action.yml --- .github/actions/run-ee-server/action.yml | 58 ++++++++++++------------ 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index 3cdb53d24..2c6b32d19 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -1,5 +1,7 @@ name: 'Run EE Server' -description: 'Run EE server' +description: 'Run EE server. Returns once server is ready. Only tested on Linux and macOS' +# NOTE: do not share this server container with others +# since it's using the default admin / admin credentials inputs: # All inputs in composite actions are strings use-server-rc: @@ -18,7 +20,6 @@ inputs: runs: using: "composite" steps: - - name: Install crudini to manipulate config.conf # This will only work on the Github hosted runners. run: pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt" @@ -36,48 +37,45 @@ runs: crudini --existing=param --set config.conf enterprise-edition hosts 127.0.0.1:3000 crudini --existing=param --set config.conf enterprise-edition user superuser crudini --existing=param --set config.conf enterprise-edition password superuser - working-directory: .github/workflows + working-directory: .github/workflows shell: bash - name: Create config folder to store configs in run: mkdir configs shell: bash - - name: Use release server - if: ${{ inputs.use-server-rc == 'false' }} - run: echo "SERVER_IMAGE=aerospike/aerospike-server-enterprise" >> $GITHUB_ENV - shell: bash - - - name: Use release candidate server - if: ${{ inputs.use-server-rc == 'true' }} - run: echo "SERVER_IMAGE=aerospike/aerospike-server-enterprise-rc" >> $GITHUB_ENV - shell: bash - - name: Log into Docker Hub to get server RC if: ${{ inputs.use-server-rc == 'true' }} run: docker login --username ${{ inputs.docker-hub-username }} --password ${{ inputs.docker-hub-password }} shell: bash - - name: Get default aerospike.conf from Docker server EE container - run: | - docker run -d --name aerospike -p 3000-3002:3000-3002 $SERVER_IMAGE:${{ inputs.server-tag }} - sleep 5 - docker cp aerospike:/etc/aerospike/aerospike.conf ./configs/aerospike.conf - docker container stop aerospike - docker container rm aerospike + - run: echo IMAGE_NAME=aerospike/aerospike-server-enterprise${{ inputs.use-server-rc == 'true' && '-rc' || '' }}:${{ inputs.server-tag }} >> $GITHUB_ENV shell: bash - - name: Enable security features using aerospike.conf - # Security stanza - run: echo -e "security {\n\tenable-quotas true\n}\n" >> ./aerospike.conf - working-directory: ./configs + - run: echo SECURITY_IMAGE_NAME=${{ env.IMAGE_NAME }}-security >> $GITHUB_ENV shell: bash - - name: Run enterprise edition server - run: docker run -tid -v $(pwd)/configs:/opt/aerospike/etc -p 3000:3000 --name aerospike $SERVER_IMAGE:${{ inputs.server-tag }} asd --config-file /opt/aerospike/etc/aerospike.conf + # macOS Github runners and Windows self-hosted runners don't have buildx installed by default + - if: ${{ runner.os == 'Windows' || runner.os == 'macOS' }} + uses: docker/setup-buildx-action@v3 + + - name: Build and push + uses: docker/build-push-action@v6 + with: + # Don't want to use default Git context or else it will clone the whole Python client repo again + context: .github/workflows + build-args: | + image=${{ env.IMAGE_NAME }} + tags: ${{ env.SECURITY_IMAGE_NAME }} + # setup-buildx-action configures Docker to use the docker-container build driver + # This driver doesn't publish an image locally by default + # so we have to manually enable it + load: true + + - run: docker run -d --name aerospike -p 3000:3000 -e DEFAULT_TTL=2592000 ${{ env.SECURITY_IMAGE_NAME }} shell: bash - - name: Create user in database for tests - # Use default admin user to create another user for testing - run: docker exec aerospike asadm --user admin --password admin --enable -e "manage acl create user superuser password superuser roles read-write-udf sys-admin user-admin data-admin" - shell: bash \ No newline at end of file + - uses: ./.github/actions/wait-for-as-server-to-start + with: + container-name: aerospike + is-security-enabled: true From 054face15d15b9fb666c71e3f58a73dcd7ac3f19 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 15:38:06 -0700 Subject: [PATCH 018/417] Create Dockerfile --- .github_former/workflows/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github_former/workflows/Dockerfile diff --git a/.github_former/workflows/Dockerfile b/.github_former/workflows/Dockerfile new file mode 100644 index 000000000..e15848240 --- /dev/null +++ b/.github_former/workflows/Dockerfile @@ -0,0 +1,10 @@ +ARG image +FROM $image +RUN echo -e "security {\n\tenable-quotas true\n}\n" >> /etc/aerospike/aerospike.template.conf +# security.smd was generated manually by +# 1. Starting a new Aerospike EE server using Docker +# 2. Creating the superuser user +# 3. Copying /opt/aerospike/smd/security.smd from the container and committing it to this repo +# This file should always work +# TODO: generate this automatically, somehow +COPY security.smd /opt/aerospike/smd/ From 839dbacfd4d71833e1dab5f143493574e3c39b57 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 15:46:50 -0700 Subject: [PATCH 019/417] Revert "Create Dockerfile" This reverts commit 054face15d15b9fb666c71e3f58a73dcd7ac3f19. --- .github_former/workflows/Dockerfile | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .github_former/workflows/Dockerfile diff --git a/.github_former/workflows/Dockerfile b/.github_former/workflows/Dockerfile deleted file mode 100644 index e15848240..000000000 --- a/.github_former/workflows/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -ARG image -FROM $image -RUN echo -e "security {\n\tenable-quotas true\n}\n" >> /etc/aerospike/aerospike.template.conf -# security.smd was generated manually by -# 1. Starting a new Aerospike EE server using Docker -# 2. Creating the superuser user -# 3. Copying /opt/aerospike/smd/security.smd from the container and committing it to this repo -# This file should always work -# TODO: generate this automatically, somehow -COPY security.smd /opt/aerospike/smd/ From 1c8b58871f1d176f5e87ba25a3b5da8262c3d9f8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 15:46:54 -0700 Subject: [PATCH 020/417] Create Dockerfile --- .github/workflows/Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/workflows/Dockerfile diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile new file mode 100644 index 000000000..e15848240 --- /dev/null +++ b/.github/workflows/Dockerfile @@ -0,0 +1,10 @@ +ARG image +FROM $image +RUN echo -e "security {\n\tenable-quotas true\n}\n" >> /etc/aerospike/aerospike.template.conf +# security.smd was generated manually by +# 1. Starting a new Aerospike EE server using Docker +# 2. Creating the superuser user +# 3. Copying /opt/aerospike/smd/security.smd from the container and committing it to this repo +# This file should always work +# TODO: generate this automatically, somehow +COPY security.smd /opt/aerospike/smd/ From 302982a8c36f35375f81d131bf9d6eaf6d5331c1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 15:48:58 -0700 Subject: [PATCH 021/417] Create security.smd --- .github/workflows/security.smd | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/security.smd diff --git a/.github/workflows/security.smd b/.github/workflows/security.smd new file mode 100644 index 000000000..9c530d514 --- /dev/null +++ b/.github/workflows/security.smd @@ -0,0 +1,48 @@ +[ + [ + 162276881999406, + 14 + ], + { + "key": "admin|P", + "value": "$2a$10$7EqJtq98hPqEX7fNZaFWoO1mVO/4MLpGzsqojz6E9Gef6iXDjXdDa", + "generation": 1, + "timestamp": 0 + }, + { + "key": "admin|R|user-admin", + "value": "", + "generation": 1, + "timestamp": 0 + }, + { + "key": "superuser|P", + "value": "$2a$10$7EqJtq98hPqEX7fNZaFWoOZX0o4mZCBUwvzt/iecIcG4JaDOC41zK", + "generation": 3, + "timestamp": 458774922440 + }, + { + "key": "superuser|R|read-write-udf", + "value": "", + "generation": 3, + "timestamp": 458774922441 + }, + { + "key": "superuser|R|sys-admin", + "value": "", + "generation": 3, + "timestamp": 458774922442 + }, + { + "key": "superuser|R|user-admin", + "value": "", + "generation": 3, + "timestamp": 458774922442 + }, + { + "key": "superuser|R|data-admin", + "value": null, + "generation": 2, + "timestamp": 458774718056 + } +] From 6ba76769f150309c5064456c2496168e844a6e36 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 20 Nov 2024 15:52:24 -0700 Subject: [PATCH 022/417] Create action.yml --- .../wait-for-as-server-to-start/action.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/actions/wait-for-as-server-to-start/action.yml diff --git a/.github/actions/wait-for-as-server-to-start/action.yml b/.github/actions/wait-for-as-server-to-start/action.yml new file mode 100644 index 000000000..26841102b --- /dev/null +++ b/.github/actions/wait-for-as-server-to-start/action.yml @@ -0,0 +1,25 @@ +name: 'Wait for Aerospike server to start' +description: Only tested on Linux and macOS +inputs: + container-name: + required: true + is-security-enabled: + required: false + default: 'false' + +runs: + using: "composite" + steps: + - name: 'macOS: install timeout command' + if: ${{ runner.os == 'macOS' }} + run: brew install coreutils + shell: bash + + # Composite actions doesn't support step-level timeout-minutes + # Use timeout command and store polling logic in file to make it easier to read + # Call bash shell explicitly since timeout uses "sh" shell by default, for some reason + # Also, we don't want to fail if we timeout in case the server *did* finish starting up but the script couldn't detect it due to a bug + # Effectively, this composite action is like calling "sleep" that is optimized to exit early when it detects an ok from the server + - name: Wait for EE server to start + run: timeout 30 bash ./.github/workflows/wait-for-as-server-to-start.bash ${{ inputs.container-name }} ${{ inputs.is-security-enabled }} || true + shell: bash From 29a088b9d67005e35623bc6d2c16e44c4d3e46b8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 07:55:27 -0700 Subject: [PATCH 023/417] Create wait-for-as-server-to-start.bash --- .../wait-for-as-server-to-start.bash | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/wait-for-as-server-to-start.bash diff --git a/.github/workflows/wait-for-as-server-to-start.bash b/.github/workflows/wait-for-as-server-to-start.bash new file mode 100644 index 000000000..c43e17da5 --- /dev/null +++ b/.github/workflows/wait-for-as-server-to-start.bash @@ -0,0 +1,47 @@ +#!/bin/bash + +set -x +# Makes sure that if the "docker exec" command fails, it is not ignored +set -o pipefail + +container_name=$1 +is_security_enabled=$2 + +if [[ $is_security_enabled == true ]]; then + # We need to pass credentials to asinfo if server requires it + # TODO: passing in credentials via command line flags since I can't figure out how to use --instance with global astools.conf + user_credentials="--user=admin --password=admin" +fi + +while true; do + # An unset variable will have a default empty value + # Intermediate step is to print docker exec command's output in case it fails + # Sometimes, errors only appear in stdout and not stderr, like if asinfo throws an error because of no credentials + # (This is a bug in asinfo since all error messages should be sent to stderr) + # But piping and passing stdin to grep will hide the first command's stdout. + # grep doesn't have a way to print all lines passed as input. + # ack does have an option but it doesn't come installed by default + # shellcheck disable=SC2086 # The flags in user credentials should be separate anyways. Not one string + echo "Checking if we can reach the server via the service port..." + if docker exec "$container_name" asinfo $user_credentials -v status | tee >(cat) | grep -qE "^ok"; then + # Server is ready when asinfo returns ok + echo "Can reach server now." + # docker container inspect "$container_name" + break + fi + + echo "Server didn't return ok via the service port. Polling again..." +done + +# Although the server may be reachable via the service port, the cluster may not be fully initialized yet. +# If we try to connect too soon (e.g right after "status" returns ok), the client may throw error code -1 +while true; do + echo "Waiting for server to stabilize (i.e return a cluster key)..." + # We assume that when an ERROR is returned, the cluster is not stable yet (i.e not fully initialized) + if docker exec "$container_name" asinfo $user_credentials -v cluster-stable 2>&1 | (! grep -qE "^ERROR"); then + echo "Server is in a stable state." + break + fi + + echo "Server did not return a cluster key. Polling again..." +done From 3b6c77f8214d6954a7e4f9b27e7bff6a7c4818bc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 08:06:50 -0700 Subject: [PATCH 024/417] Update action.yml --- .github/actions/run-ee-server-for-ext-container/action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index 3aa0e4f6c..3cda32486 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,6 +31,11 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash + name: Get IP address of Docker container hosting server + run: echo $GITHUB_OUTPUT + shell: bash + + - name: Configure tests to connect to that Docker container run: | pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; From 34d2695046bd62956f140fd33f7aefa60e01957f Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 08:27:36 -0700 Subject: [PATCH 025/417] Update action.yml --- .github/actions/run-ee-server-for-ext-container/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index 3cda32486..cb6d615f9 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,7 +31,7 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash - name: Get IP address of Docker container hosting server + - name: Get IP address of Docker container hosting server run: echo $GITHUB_OUTPUT shell: bash From 1e835f294d9b1a92781bed670797c97c2649bcbc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 08:36:10 -0700 Subject: [PATCH 026/417] Update action.yml --- .github/actions/run-ee-server-for-ext-container/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index cb6d615f9..c52cd12d0 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,7 +31,7 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash - - name: Get IP address of Docker container hosting server + - name: print IP address run: echo $GITHUB_OUTPUT shell: bash From 1685deb07cc688a9c8934220ab2d5138e7328247 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 08:48:19 -0700 Subject: [PATCH 027/417] Update action.yml --- .github/actions/run-ee-server-for-ext-container/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index c52cd12d0..30a21a608 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,8 +31,8 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash - - name: print IP address - run: echo $GITHUB_OUTPUT + - name: print IP address + run: cat $GITHUB_OUTPUT shell: bash From 394e125d22ff527a5b883e6fb9bb846d999c5963 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 10:21:20 -0700 Subject: [PATCH 028/417] Update action.yml --- .github/actions/run-ee-server-for-ext-container/action.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index 30a21a608..3d9c5c765 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,14 +31,10 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash - - name: print IP address - run: cat $GITHUB_OUTPUT - shell: bash - - - name: Configure tests to connect to that Docker container run: | pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; crudini --existing=param --set config.conf enterprise-edition hosts ${{ steps.get-server-ip-address.outputs.server-ip }}:3000; + cat config.conf working-directory: .github/workflows shell: bash From 545831ca340fda2878ee5a1fc82e55dd4c8f33ef Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 10:28:02 -0700 Subject: [PATCH 029/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index ae91cfbd9..2fe6f2cf9 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -237,6 +237,7 @@ jobs: - name: Run tests if: ${{ inputs.run_tests}} run: | + docker ps; cd ts-test; npm install typescript --save-dev; npx tsc; @@ -356,7 +357,7 @@ jobs: - run: npx tsc shell: bash - - run: npm run test dist/ -- --h 127.0.0.1 --port 3000 + - run: npm run test dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000 shell: bash - name: Show job status for commit From 160c3d2e8e7094480a716af1ff1b7571e04e182e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 10:38:00 -0700 Subject: [PATCH 030/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2fe6f2cf9..d34f0adc7 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -242,7 +242,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h 127.0.0.1 --port 3000; + npm run test dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel From 4409ccca202ee98afa24cdc007e5421ebd30de64 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 12:52:09 -0700 Subject: [PATCH 031/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index d34f0adc7..81e6c5008 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -242,7 +242,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; + npm run test dist/ -- --h 0.0.0.0 --port 3000; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel From e58f0b6b878d9f7ad562b984fd241186bcd6f545 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 13:03:56 -0700 Subject: [PATCH 032/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 81e6c5008..cd90e64e8 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -238,6 +238,7 @@ jobs: if: ${{ inputs.run_tests}} run: | docker ps; + docker logs aerospike; cd ts-test; npm install typescript --save-dev; npx tsc; From dabab2943225c9486da7332c18ca15414051af29 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 13:09:47 -0700 Subject: [PATCH 033/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index cd90e64e8..e0195c327 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -243,7 +243,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h 0.0.0.0 --port 3000; + npm run test dist/ -- --h 127.0.0.1 --port 3002; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel From 405d40da7f890935cc57e0460804bcb15f545581 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 13:53:58 -0700 Subject: [PATCH 034/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index e0195c327..a612d3ff1 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -234,6 +234,7 @@ jobs: ./scripts/build-c-client.sh; npm install; + - name: Run tests if: ${{ inputs.run_tests}} run: | @@ -243,7 +244,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h 127.0.0.1 --port 3002; + npm run test dist/ -- --h 172.17.0.2 --port 3000; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel From 8c5b8a15b642650f193d369b00d511482ee7aad7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 14:17:38 -0700 Subject: [PATCH 035/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a612d3ff1..14152eaa9 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -244,7 +244,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h 172.17.0.2 --port 3000; + npm run test dist/ -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel From af5a87192805c7477b9cb543fddc480645941fbc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 14:34:27 -0700 Subject: [PATCH 036/417] Update batch_write.ts --- ts-test/tests/batch_write.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ts-test/tests/batch_write.ts b/ts-test/tests/batch_write.ts index e653b0200..2c24f0940 100644 --- a/ts-test/tests/batch_write.ts +++ b/ts-test/tests/batch_write.ts @@ -532,7 +532,10 @@ describe('client.batchWrite()', function () { hosts: helper.config.hosts, policies: { batchParentWrite: new Aerospike.BatchPolicy({ socketTimeout: 0, totalTimeout: 0, deserialize: false }) - } + }, + user: helper.config.user, + password: helper.config.password + } const dummyClient = await Aerospike.connect(config) From 23bce37d7b502a540c2e68f4bd12c86637ccab20 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 15:41:55 -0700 Subject: [PATCH 037/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 14152eaa9..bd3d97114 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -184,7 +184,7 @@ jobs: - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} - uses: ./.github/actions/run-ee-server + uses: ./.github/actions/run-ee-server-for-ext-container with: use-server-rc: ${{ inputs.use-server-rc }} server-tag: ${{ inputs.server-tag }} From 611046c408bb3a6734d88946eb925d168faf4826 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 15:54:27 -0700 Subject: [PATCH 038/417] Update build-bindings.yml --- .github/workflows/build-bindings.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index bd3d97114..330dd3df3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -182,18 +182,18 @@ jobs: if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} uses: ./.github/actions/setup-docker-on-macos - - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' - if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} - uses: ./.github/actions/run-ee-server-for-ext-container - with: - use-server-rc: ${{ inputs.use-server-rc }} - server-tag: ${{ inputs.server-tag }} - docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} - docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + #- name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' + # if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} + # uses: ./.github/actions/run-ee-server-for-ext-container + # with: + # use-server-rc: ${{ inputs.use-server-rc }} + # server-tag: ${{ inputs.server-tag }} + # docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + # docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} # TODO: combine this composite action and the above into one - name: "Linux: run Aerospike server in Docker container and configure config.conf to connect to the server container's Docker IP address" - if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} + # if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} uses: ./.github/actions/run-ee-server-for-ext-container with: use-server-rc: ${{ inputs.use-server-rc }} From 615480b93edf95771d4a6d5e68d3146ca16a63f8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 16:29:43 -0700 Subject: [PATCH 039/417] Pipeline improvements --- .github/workflows/build-bindings.yml | 2 +- .github/workflows/dev-workflow-p2.yml | 43 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/dev-workflow-p2.yml diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 330dd3df3..20b0fff11 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -244,7 +244,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; + npm run test dist/ -- --h 172.17.0.3 --port 3000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml new file mode 100644 index 000000000..7427ec970 --- /dev/null +++ b/.github/workflows/dev-workflow-p2.yml @@ -0,0 +1,43 @@ +name: Dev workflow (part 2) + +on: + pull_request_target: + branches: + - 'dev*' + types: + - closed + workflow_dispatch: + +jobs: + bump-dev-number: + if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + uses: ./.github/workflows/bump-version.yml + with: + change: 'bump-dev-num' + secrets: inherit + + rebuild-artifacts-with-new-dev-num: + needs: bump-dev-number + name: Rebuild artifacts with new dev number + uses: ./.github/workflows/build-artifacts.yml + with: + # On pull_request_target, the bump version commit will be ignored + # So we must pass it manually to the workflow + sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} + secrets: inherit + + upload-to-jfrog: + name: Upload artifacts to JFrog + needs: [ + bump-dev-number, + rebuild-artifacts-with-new-dev-num + ] + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit + + # We don't want the artifacts in JFrog to also exist in Github + delete-artifacts: + needs: upload-to-jfrog + uses: ./.github/workflows/delete-artifacts.yml From 2551d4c56a4989b5a2524344f28857dbfaaacca8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 16:46:16 -0700 Subject: [PATCH 040/417] improved pipeline --- .github/workflows/build-bindings.yml | 2 +- .github/workflows/dev-workflow-p2.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 20b0fff11..330dd3df3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -244,7 +244,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h 172.17.0.3 --port 3000 --U superuser --P superuser; + npm run test dist/ -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 7427ec970..a2576860d 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -2,6 +2,8 @@ name: Dev workflow (part 2) on: pull_request_target: + types: + - synchronize branches: - 'dev*' types: From 4b0808f30afefb2bd3fe45f3b11ed88fe0f4df27 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 21 Nov 2024 17:27:19 -0700 Subject: [PATCH 041/417] pipeline improvement --- .github/workflows/build-bindings.yml | 13 ++++++++++++- .github/workflows/dev-workflow-p2.yml | 5 +---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 330dd3df3..26bdb2bec 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -236,7 +236,7 @@ jobs: - name: Run tests - if: ${{ inputs.run_tests}} + if: ${{ inputs.run_tests && inputs.platform-tag == 'manylinux_x86_64'}} run: | docker ps; docker logs aerospike; @@ -246,6 +246,17 @@ jobs: cd ..; npm run test dist/ -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; + - name: Run tests + if: ${{ inputs.run_tests && inputs.platform-tag == 'macosx_x86_64'}} + run: | + docker ps; + docker logs aerospike; + cd ts-test; + npm install typescript --save-dev; + npx tsc; + cd ..; + npm run test dist/ -- --h localhost --port 3000 --U superuser --P superuser; + # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel # uses: pypa/cibuildwheel@v2.20.0 diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index a2576860d..94a9abdc7 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -1,14 +1,11 @@ name: Dev workflow (part 2) on: - pull_request_target: + pull_request: types: - synchronize branches: - 'dev*' - types: - - closed - workflow_dispatch: jobs: bump-dev-number: From cf38891a6e251e4e76052b588c82f363770c81b4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 22 Nov 2024 05:24:59 -0700 Subject: [PATCH 042/417] pipeline improvements --- .github/actions/run-ee-server/action.yml | 47 +++++++++++++----- .../wait-for-as-server-to-start/action.yml | 7 ++- .github/workflows/build-bindings.yml | 12 ++++- .../workflows/docker-build-context/Dockerfile | 49 +++++++++++++++++++ .../workflows/docker-build-context/roster.smd | 12 +++++ .../{ => docker-build-context}/security.smd | 0 .../wait-for-as-server-to-start.bash | 10 +++- 7 files changed, 121 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/docker-build-context/Dockerfile create mode 100644 .github/workflows/docker-build-context/roster.smd rename .github/workflows/{ => docker-build-context}/security.smd (100%) diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index 2c6b32d19..ab13bc071 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -6,15 +6,20 @@ inputs: # All inputs in composite actions are strings use-server-rc: required: true - default: false + description: Deploy server release candidate? + default: 'false' server-tag: required: true + description: Specify Docker tag + default: 'latest' # Github Composite Actions can't access secrets # so we need to pass them in as inputs docker-hub-username: + description: Required for using release candidates required: false docker-hub-password: + description: Required for using release candidates required: false runs: @@ -35,15 +40,18 @@ runs: run: | crudini --existing=param --set config.conf enterprise-edition hosts '' crudini --existing=param --set config.conf enterprise-edition hosts 127.0.0.1:3000 - crudini --existing=param --set config.conf enterprise-edition user superuser - crudini --existing=param --set config.conf enterprise-edition password superuser working-directory: .github/workflows shell: bash - - name: Create config folder to store configs in - run: mkdir configs + - run: echo SUPERUSER_NAME_AND_PASSWORD="superuser" >> $GITHUB_ENV shell: bash + - name: Set credentials in config file + run: | + crudini --existing=param --set config.conf enterprise-edition user ${{ env.SUPERUSER_NAME_AND_PASSWORD }} + crudini --existing=param --set config.conf enterprise-edition password ${{ env.SUPERUSER_NAME_AND_PASSWORD }} + working-directory: test + - name: Log into Docker Hub to get server RC if: ${{ inputs.use-server-rc == 'true' }} run: docker login --username ${{ inputs.docker-hub-username }} --password ${{ inputs.docker-hub-password }} @@ -63,19 +71,36 @@ runs: uses: docker/build-push-action@v6 with: # Don't want to use default Git context or else it will clone the whole Python client repo again - context: .github/workflows + context: .github/workflows/docker-build-context build-args: | - image=${{ env.IMAGE_NAME }} - tags: ${{ env.SECURITY_IMAGE_NAME }} + server_image=${{ env.IMAGE_NAME }} + tags: ${{ env.NEW_IMAGE_NAME }} # setup-buildx-action configures Docker to use the docker-container build driver # This driver doesn't publish an image locally by default # so we have to manually enable it load: true - - run: docker run -d --name aerospike -p 3000:3000 -e DEFAULT_TTL=2592000 ${{ env.SECURITY_IMAGE_NAME }} + - run: echo SERVER_CONTAINER_NAME="aerospike" >> $GITHUB_ENV shell: bash + - run: docker run -d --name ${{ env.SERVER_CONTAINER_NAME }} -e DEFAULT_TTL=2592000 -p 3000:3000 ${{ env.NEW_IMAGE_NAME }} + - uses: ./.github/actions/wait-for-as-server-to-start with: - container-name: aerospike - is-security-enabled: true + container-name: ${{ env.SERVER_CONTAINER_NAME }} + is-strong-consistency-enabled: true + + - run: echo ASADM_AUTH_FLAGS="--user=${{ env.SUPERUSER_NAME_AND_PASSWORD }} --password=${{ env.SUPERUSER_NAME_AND_PASSWORD }}" >> $GITHUB_ENV + shell: bash + + # All the partitions are assumed to be dead when reusing a roster file + - run: docker exec ${{ env.SERVER_CONTAINER_NAME }} asadm $ASADM_AUTH_FLAGS --enable --execute "manage revive ns test" + shell: bash + + # Apply changes + - run: docker exec ${{ env.SERVER_CONTAINER_NAME }} asadm $ASADM_AUTH_FLAGS --enable --execute "manage recluster" + shell: bash + + # For debugging + - run: docker logs aerospike + shell: bash \ No newline at end of file diff --git a/.github/actions/wait-for-as-server-to-start/action.yml b/.github/actions/wait-for-as-server-to-start/action.yml index 26841102b..bdc96ede1 100644 --- a/.github/actions/wait-for-as-server-to-start/action.yml +++ b/.github/actions/wait-for-as-server-to-start/action.yml @@ -6,7 +6,10 @@ inputs: is-security-enabled: required: false default: 'false' - + is-strong-consistency-enabled: + required: false + default: 'false' + runs: using: "composite" steps: @@ -21,5 +24,5 @@ runs: # Also, we don't want to fail if we timeout in case the server *did* finish starting up but the script couldn't detect it due to a bug # Effectively, this composite action is like calling "sleep" that is optimized to exit early when it detects an ok from the server - name: Wait for EE server to start - run: timeout 30 bash ./.github/workflows/wait-for-as-server-to-start.bash ${{ inputs.container-name }} ${{ inputs.is-security-enabled }} || true + run: timeout 30 bash ./.github/workflows/wait-for-as-server-to-start.bash ${{ inputs.container-name }} ${{ inputs.is-security-enabled }} ${{ inputs.is-strong-consistency-enabled }} || true shell: bash diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 26bdb2bec..42835ce5b 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -65,6 +65,10 @@ on: required: true default: 'latest' description: 'Server docker image tag' + test-file: + required: false + default: '' + description: 'new_tests/' workflow_call: inputs: @@ -106,6 +110,10 @@ on: type: string default: 'latest' description: 'Server docker image tag' + test-file: + required: false + type: string + default: '' secrets: # Just make all the secrets required to make things simpler... DOCKER_HUB_BOT_USERNAME: @@ -244,7 +252,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; - name: Run tests if: ${{ inputs.run_tests && inputs.platform-tag == 'macosx_x86_64'}} @@ -255,7 +263,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/ -- --h localhost --port 3000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel diff --git a/.github/workflows/docker-build-context/Dockerfile b/.github/workflows/docker-build-context/Dockerfile new file mode 100644 index 000000000..e64943a02 --- /dev/null +++ b/.github/workflows/docker-build-context/Dockerfile @@ -0,0 +1,49 @@ +ARG server_image=aerospike/aerospike-server-enterprise +ARG ROSTER_FILE_NAME=roster.smd +# Temp file for passing node id from one build stage to another +# Docker doesn't support command substitution for setting values for ARG variables, so we have to do this +ARG NODE_ID_FILE_NAME=node_id + +FROM $server_image as configure-server + +WORKDIR /opt/aerospike/smd + +# Enable authentication + +ARG AEROSPIKE_CONF_TEMPLATE_PATH=/etc/aerospike/aerospike.template.conf + +# Not using asconfig to edit config because we are working with a template file, which may not have valid values yet +RUN echo -e "security {\n\tenable-quotas true\n}\n" >> $AEROSPIKE_CONF_TEMPLATE_PATH +# security.smd was generated manually by +# 1. Starting a new Aerospike EE server using Docker +# 2. Creating the superuser user +# 3. Copying /opt/aerospike/smd/security.smd from the container and committing it to this repo +# This file should always work +# TODO: generate this automatically, somehow. +COPY security.smd . + +# Enable strong consistency +RUN sed -i "s/\(namespace.*{\)/\1\n\tstrong-consistency true/" $AEROSPIKE_CONF_TEMPLATE_PATH +RUN sed -i "s/\(namespace.*{\)/\1\n\tstrong-consistency-allow-expunge true/" $AEROSPIKE_CONF_TEMPLATE_PATH +ARG ROSTER_FILE_NAME +COPY $ROSTER_FILE_NAME . + +# Fetch node id from roster.smd + +# There's no tag for the latest major version to prevent breaking changes in jq +# This is the next best thing +FROM ghcr.io/jqlang/jq:1.7 as get-jq +# jq docker image doesn't have a shell +# We need a shell to fetch and pass the node id to the next build stage +FROM busybox as get-node-id +COPY --from=get-jq /jq /bin/ +ARG ROSTER_FILE_NAME +COPY $ROSTER_FILE_NAME . +ARG NODE_ID_FILE_NAME +RUN jq --raw-output '.[1].value' $ROSTER_FILE_NAME > $NODE_ID_FILE_NAME + +FROM configure-server as set-node-id +ARG NODE_ID_FILE_NAME +COPY --from=get-node-id $NODE_ID_FILE_NAME . +RUN sed -i "s/\(^service {\)/\1\n\tnode-id $(cat $NODE_ID_FILE_NAME)/" $AEROSPIKE_CONF_TEMPLATE_PATH +RUN rm $NODE_ID_FILE_NAME \ No newline at end of file diff --git a/.github/workflows/docker-build-context/roster.smd b/.github/workflows/docker-build-context/roster.smd new file mode 100644 index 000000000..76ba77ef0 --- /dev/null +++ b/.github/workflows/docker-build-context/roster.smd @@ -0,0 +1,12 @@ +[ + [ + 97107025374203, + 1 + ], + { + "key": "test", + "value": "a1", + "generation": 1, + "timestamp": 465602976982 + } +] \ No newline at end of file diff --git a/.github/workflows/security.smd b/.github/workflows/docker-build-context/security.smd similarity index 100% rename from .github/workflows/security.smd rename to .github/workflows/docker-build-context/security.smd diff --git a/.github/workflows/wait-for-as-server-to-start.bash b/.github/workflows/wait-for-as-server-to-start.bash index c43e17da5..18189f193 100644 --- a/.github/workflows/wait-for-as-server-to-start.bash +++ b/.github/workflows/wait-for-as-server-to-start.bash @@ -6,6 +6,7 @@ set -o pipefail container_name=$1 is_security_enabled=$2 +is_strong_consistency_enabled=$3 if [[ $is_security_enabled == true ]]; then # We need to pass credentials to asinfo if server requires it @@ -38,7 +39,14 @@ done while true; do echo "Waiting for server to stabilize (i.e return a cluster key)..." # We assume that when an ERROR is returned, the cluster is not stable yet (i.e not fully initialized) - if docker exec "$container_name" asinfo $user_credentials -v cluster-stable 2>&1 | (! grep -qE "^ERROR"); then + cluster_stable_info_cmd="cluster-stable" + if [[ $is_strong_consistency_enabled == true ]]; then + # The Dockerfile uses a roster from a previously running Aerospike server in a Docker container + # When we reuse this roster, the server assumes all of its partitions are dead because it's running on a new + # storage device. + cluster_stable_info_cmd="$cluster_stable_info_cmd:ignore-migrations=true" + fi + if docker exec "$container_name" asinfo $user_credentials -v $cluster_stable_info_cmd 2>&1 | (! grep -qE "^ERROR"); then echo "Server is in a stable state." break fi From d9afd79c82ce1be056b1c90a746093b9d8a7b250 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 22 Nov 2024 06:12:02 -0700 Subject: [PATCH 043/417] Update action.yml --- .github/actions/run-ee-server/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index ab13bc071..a5fbce6a4 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -51,6 +51,7 @@ runs: crudini --existing=param --set config.conf enterprise-edition user ${{ env.SUPERUSER_NAME_AND_PASSWORD }} crudini --existing=param --set config.conf enterprise-edition password ${{ env.SUPERUSER_NAME_AND_PASSWORD }} working-directory: test + shell: bash - name: Log into Docker Hub to get server RC if: ${{ inputs.use-server-rc == 'true' }} @@ -84,6 +85,7 @@ runs: shell: bash - run: docker run -d --name ${{ env.SERVER_CONTAINER_NAME }} -e DEFAULT_TTL=2592000 -p 3000:3000 ${{ env.NEW_IMAGE_NAME }} + shell: bash - uses: ./.github/actions/wait-for-as-server-to-start with: From f5700460054e4f311e46f9f6ce04680cb7a0d9bb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 22 Nov 2024 06:23:53 -0700 Subject: [PATCH 044/417] Update action.yml --- .github/actions/run-ee-server/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index a5fbce6a4..c900f96e1 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -50,7 +50,7 @@ runs: run: | crudini --existing=param --set config.conf enterprise-edition user ${{ env.SUPERUSER_NAME_AND_PASSWORD }} crudini --existing=param --set config.conf enterprise-edition password ${{ env.SUPERUSER_NAME_AND_PASSWORD }} - working-directory: test + working-directory: .github/workflows shell: bash - name: Log into Docker Hub to get server RC From d8db173bcdb27fb5945fbfb99365f9dc5d4615bd Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 22 Nov 2024 06:43:20 -0700 Subject: [PATCH 045/417] Update action.yml --- .github/actions/run-ee-server/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index c900f96e1..d6fdf3c72 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -60,8 +60,8 @@ runs: - run: echo IMAGE_NAME=aerospike/aerospike-server-enterprise${{ inputs.use-server-rc == 'true' && '-rc' || '' }}:${{ inputs.server-tag }} >> $GITHUB_ENV shell: bash - - - run: echo SECURITY_IMAGE_NAME=${{ env.IMAGE_NAME }}-security >> $GITHUB_ENV + + - run: echo NEW_IMAGE_NAME=${{ env.IMAGE_NAME }}-security-and-sc >> $GITHUB_ENV shell: bash # macOS Github runners and Windows self-hosted runners don't have buildx installed by default From aa20ba64f611b3d5836efe3c3397aa24d4634a5d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 22 Nov 2024 09:02:51 -0700 Subject: [PATCH 046/417] Update action.yml --- .github/actions/wait-for-as-server-to-start/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/wait-for-as-server-to-start/action.yml b/.github/actions/wait-for-as-server-to-start/action.yml index bdc96ede1..373c26970 100644 --- a/.github/actions/wait-for-as-server-to-start/action.yml +++ b/.github/actions/wait-for-as-server-to-start/action.yml @@ -6,10 +6,10 @@ inputs: is-security-enabled: required: false default: 'false' - is-strong-consistency-enabled: + is-strong-consistency-enabled: required: false default: 'false' - + runs: using: "composite" steps: From 54307206ed6dde35351504dddf1ee96e7f34ac5c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 4 Dec 2024 09:48:27 -0700 Subject: [PATCH 047/417] Pipeline improvements --- .github/actions/update-version/action.yml | 2 +- .github/workflows/bump-dev-num.js | 25 + .github/workflows/bump-version.yml | 8 +- .github/workflows/dev-workflow-p2.yml | 2 +- .../workflows/docker-build-context/Dockerfile | 1 + package-lock.json | 606 ++++++++++-------- package.json | 2 +- ts-test/package-lock.json | 12 +- 8 files changed, 373 insertions(+), 285 deletions(-) create mode 100644 .github/workflows/bump-dev-num.js diff --git a/.github/actions/update-version/action.yml b/.github/actions/update-version/action.yml index 21a306344..ae81938d4 100644 --- a/.github/actions/update-version/action.yml +++ b/.github/actions/update-version/action.yml @@ -9,5 +9,5 @@ runs: using: "composite" steps: - name: Update VERSION metadata - run: echo ${{ inputs.new_version }} > VERSION + run: npm version ${{ inputs.new_version }} --no-git-tag-version shell: bash diff --git a/.github/workflows/bump-dev-num.js b/.github/workflows/bump-dev-num.js new file mode 100644 index 000000000..138efe875 --- /dev/null +++ b/.github/workflows/bump-dev-num.js @@ -0,0 +1,25 @@ +const semver = require('semver'); + +const versionString = process.argv[2]; +let version = semver.parse(versionString); + +if (!version) { + console.error("Invalid version string"); + process.exit(1); +} + +if (version.prerelease.includes('dev')) { + // Increment the dev release number + version.inc('prerelease', 'dev'); +} else if (version.prerelease.includes('rc')) { + // Increment the RC number + version.inc('prerelease', 'rc'); + version.prerelease[1] = 1; // Ensure dev number starts at 1 +} else { + // Assume this is a release version + version.inc('minor'); // Bump to next minor version + version.prerelease = ['rc', 1]; // Start RC numbers from 1 + version.format(); // Apply changes +} + +console.log(version.version); diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index cec01cb05..22fef3397 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -55,7 +55,7 @@ jobs: - name: Get current version id: get-current-version - run: echo current_version=$(cat VERSION) >> $GITHUB_OUTPUT + run: echo current_version=$(node -e "console.log(require('./package.json').version);") >> $GITHUB_OUTPUT get-new-version: runs-on: ubuntu-22.04 @@ -66,14 +66,14 @@ jobs: # Checkout branch where workflow is being called from - uses: actions/checkout@v4 - - name: Install library that parses PEP 440 versions + - name: Install library that parses nodejs versions # NEED TO CHANGE THIS TO WORK WITH NODEJS - run: pip install parver -c requirements.txt + run: npm install semver working-directory: .github/workflows - name: Get new version id: get-new-version - run: echo new_version=$(python3 .github/workflows/${{ inputs.change }}.py ${{ needs.get-current-version.outputs.current_version }}) >> $GITHUB_OUTPUT + run: echo new_version=$(node bump-dev-num.js) >> $GITHUB_OUTPUT update-version-in-repo: needs: get-new-version diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 94a9abdc7..76daed810 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -9,7 +9,7 @@ on: jobs: bump-dev-number: - if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} uses: ./.github/workflows/bump-version.yml with: change: 'bump-dev-num' diff --git a/.github/workflows/docker-build-context/Dockerfile b/.github/workflows/docker-build-context/Dockerfile index e64943a02..f2af08d07 100644 --- a/.github/workflows/docker-build-context/Dockerfile +++ b/.github/workflows/docker-build-context/Dockerfile @@ -25,6 +25,7 @@ COPY security.smd . # Enable strong consistency RUN sed -i "s/\(namespace.*{\)/\1\n\tstrong-consistency true/" $AEROSPIKE_CONF_TEMPLATE_PATH RUN sed -i "s/\(namespace.*{\)/\1\n\tstrong-consistency-allow-expunge true/" $AEROSPIKE_CONF_TEMPLATE_PATH +RUN sed -i "s/\(namespace.*{\)/\1\n\tdefault-ttl 2592000/" $AEROSPIKE_CONF_TEMPLATE_PATH ARG ROSTER_FILE_NAME COPY $ROSTER_FILE_NAME . diff --git a/package-lock.json b/package-lock.json index 98eb763a1..46a60309c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "aerospike", - "version": "5.13.2", + "version": "5.13.2-dev1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aerospike", - "version": "5.13.2", + "version": "5.13.2-dev1", "cpu": [ "x64", "arm64" @@ -82,9 +82,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz", - "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz", + "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==", "dev": true, "engines": { "node": ">=6.9.0" @@ -136,13 +136,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz", - "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz", + "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==", "dev": true, "dependencies": { - "@babel/parser": "^7.26.2", - "@babel/types": "^7.26.0", + "@babel/parser": "^7.26.3", + "@babel/types": "^7.26.3", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -262,12 +262,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.26.2", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz", - "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz", + "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==", "dev": true, "dependencies": { - "@babel/types": "^7.26.0" + "@babel/types": "^7.26.3" }, "bin": { "parser": "bin/babel-parser.js" @@ -291,16 +291,16 @@ } }, "node_modules/@babel/traverse": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", - "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.3.tgz", + "integrity": "sha512-yTmc8J+Sj8yLzwr4PD5Xb/WF3bOYu2C2OoSZPzbuqRm4n98XirsbzaX+GloeO376UnSYIYJ4NCanwV5/ugZkwA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/generator": "^7.25.9", - "@babel/parser": "^7.25.9", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.3", + "@babel/parser": "^7.26.3", "@babel/template": "^7.25.9", - "@babel/types": "^7.25.9", + "@babel/types": "^7.26.3", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -318,9 +318,9 @@ } }, "node_modules/@babel/types": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", - "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", + "version": "7.26.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz", + "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.25.9", @@ -426,9 +426,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz", - "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==", + "version": "9.16.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz", + "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -812,44 +812,44 @@ "dev": true }, "node_modules/@shikijs/core": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.22.2.tgz", - "integrity": "sha512-bvIQcd8BEeR1yFvOYv6HDiyta2FFVePbzeowf5pPS1avczrPK+cjmaxxh0nx5QzbON7+Sv0sQfQVciO7bN72sg==", + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.24.0.tgz", + "integrity": "sha512-6pvdH0KoahMzr6689yh0QJ3rCgF4j1XsXRHNEeEN6M4xJTfQ6QPWrmHzIddotg+xPJUPEPzYzYCKzpYyhTI6Gw==", "dev": true, "dependencies": { - "@shikijs/engine-javascript": "1.22.2", - "@shikijs/engine-oniguruma": "1.22.2", - "@shikijs/types": "1.22.2", + "@shikijs/engine-javascript": "1.24.0", + "@shikijs/engine-oniguruma": "1.24.0", + "@shikijs/types": "1.24.0", "@shikijs/vscode-textmate": "^9.3.0", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.3" } }, "node_modules/@shikijs/engine-javascript": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.22.2.tgz", - "integrity": "sha512-iOvql09ql6m+3d1vtvP8fLCVCK7BQD1pJFmHIECsujB0V32BJ0Ab6hxk1ewVSMFA58FI0pR2Had9BKZdyQrxTw==", + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.24.0.tgz", + "integrity": "sha512-ZA6sCeSsF3Mnlxxr+4wGEJ9Tto4RHmfIS7ox8KIAbH0MTVUkw3roHPHZN+LlJMOHJJOVupe6tvuAzRpN8qK1vA==", "dev": true, "dependencies": { - "@shikijs/types": "1.22.2", + "@shikijs/types": "1.24.0", "@shikijs/vscode-textmate": "^9.3.0", - "oniguruma-to-js": "0.4.3" + "oniguruma-to-es": "0.7.0" } }, "node_modules/@shikijs/engine-oniguruma": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.22.2.tgz", - "integrity": "sha512-GIZPAGzQOy56mGvWMoZRPggn0dTlBf1gutV5TdceLCZlFNqWmuc7u+CzD0Gd9vQUTgLbrt0KLzz6FNprqYAxlA==", + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.0.tgz", + "integrity": "sha512-Eua0qNOL73Y82lGA4GF5P+G2+VXX9XnuUxkiUuwcxQPH4wom+tE39kZpBFXfUuwNYxHSkrSxpB1p4kyRW0moSg==", "dev": true, "dependencies": { - "@shikijs/types": "1.22.2", + "@shikijs/types": "1.24.0", "@shikijs/vscode-textmate": "^9.3.0" } }, "node_modules/@shikijs/types": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.22.2.tgz", - "integrity": "sha512-NCWDa6LGZqTuzjsGfXOBWfjS/fDIbDdmVDug+7ykVe1IKT4c1gakrvlfFYp5NhAXH/lyqLM8wsAPo5wNy73Feg==", + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.24.0.tgz", + "integrity": "sha512-aptbEuq1Pk88DMlCe+FzXNnBZ17LCiLIGWAeCWhoFDzia5Q5Krx3DgnULLiouSdd6+LUM39XwXGppqYE0Ghtug==", "dev": true, "dependencies": { "@shikijs/vscode-textmate": "^9.3.0", @@ -896,12 +896,12 @@ } }, "node_modules/@types/node": { - "version": "22.8.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.6.tgz", - "integrity": "sha512-tosuJYKrIqjQIlVCM4PEGxOmyg3FCPa/fViuJChnGeEIhjA46oy8FMVoF9su1/v8PNs2a8Q0iFNyOx0uOF91nw==", + "version": "22.10.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz", + "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==", "dev": true, "dependencies": { - "undici-types": "~6.19.8" + "undici-types": "~6.20.0" } }, "node_modules/@types/unist": { @@ -911,16 +911,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz", - "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.17.0.tgz", + "integrity": "sha512-HU1KAdW3Tt8zQkdvNoIijfWDMvdSweFYm4hWh+KwhPstv+sCmWb89hCIP8msFm9N1R/ooh9honpSuvqKWlYy3w==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.12.2", - "@typescript-eslint/type-utils": "8.12.2", - "@typescript-eslint/utils": "8.12.2", - "@typescript-eslint/visitor-keys": "8.12.2", + "@typescript-eslint/scope-manager": "8.17.0", + "@typescript-eslint/type-utils": "8.17.0", + "@typescript-eslint/utils": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -944,15 +944,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz", - "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.17.0.tgz", + "integrity": "sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "8.12.2", - "@typescript-eslint/types": "8.12.2", - "@typescript-eslint/typescript-estree": "8.12.2", - "@typescript-eslint/visitor-keys": "8.12.2", + "@typescript-eslint/scope-manager": "8.17.0", + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/typescript-estree": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0", "debug": "^4.3.4" }, "engines": { @@ -972,13 +972,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz", - "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.17.0.tgz", + "integrity": "sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.12.2", - "@typescript-eslint/visitor-keys": "8.12.2" + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -989,13 +989,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz", - "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.17.0.tgz", + "integrity": "sha512-q38llWJYPd63rRnJ6wY/ZQqIzPrBCkPdpIsaCfkR3Q4t3p6sb422zougfad4TFW9+ElIFLVDzWGiGAfbb/v2qw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "8.12.2", - "@typescript-eslint/utils": "8.12.2", + "@typescript-eslint/typescript-estree": "8.17.0", + "@typescript-eslint/utils": "8.17.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -1006,6 +1006,9 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, "peerDependenciesMeta": { "typescript": { "optional": true @@ -1013,9 +1016,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz", - "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.17.0.tgz", + "integrity": "sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1026,13 +1029,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz", - "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.17.0.tgz", + "integrity": "sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.12.2", - "@typescript-eslint/visitor-keys": "8.12.2", + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/visitor-keys": "8.17.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1078,15 +1081,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz", - "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.17.0.tgz", + "integrity": "sha512-bQC8BnEkxqG8HBGKwG9wXlZqg37RKSMY7v/X8VEWD8JG2JuTHuNK0VFvMPMUKQcbk6B+tf05k+4AShAEtCtJ/w==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.12.2", - "@typescript-eslint/types": "8.12.2", - "@typescript-eslint/typescript-estree": "8.12.2" + "@typescript-eslint/scope-manager": "8.17.0", + "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/typescript-estree": "8.17.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1097,16 +1100,21 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz", - "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.17.0.tgz", + "integrity": "sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.12.2", - "eslint-visitor-keys": "^3.4.3" + "@typescript-eslint/types": "8.17.0", + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1116,6 +1124,18 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", @@ -1691,9 +1711,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001676", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz", - "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==", + "version": "1.0.30001686", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz", + "integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==", "dev": true, "funding": [ { @@ -1938,9 +1958,9 @@ "dev": true }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -2152,9 +2172,9 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/electron-to-chromium": { - "version": "1.5.50", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz", - "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==", + "version": "1.5.68", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.68.tgz", + "integrity": "sha512-FgMdJlma0OzUYlbrtZ4AeXjKxKPk6KT8WOP8BjcqxWtlg8qyJQjRzPJzUtUn5GBg1oQ26hFs7HOOHJMYiJRnvQ==", "dev": true }, "node_modules/emoji-regex": { @@ -2162,6 +2182,12 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, + "node_modules/emoji-regex-xs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz", + "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==", + "dev": true + }, "node_modules/encoding": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", @@ -2205,9 +2231,9 @@ } }, "node_modules/es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "version": "1.23.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz", + "integrity": "sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==", "dependencies": { "array-buffer-byte-length": "^1.0.1", "arraybuffer.prototype.slice": "^1.0.3", @@ -2224,7 +2250,7 @@ "function.prototype.name": "^1.1.6", "get-intrinsic": "^1.2.4", "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", + "globalthis": "^1.0.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.3", @@ -2240,10 +2266,10 @@ "is-string": "^1.0.7", "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "object-inspect": "^1.13.3", "object-keys": "^1.1.1", "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", + "regexp.prototype.flags": "^1.5.3", "safe-array-concat": "^1.1.2", "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.9", @@ -2283,9 +2309,9 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.1.0.tgz", - "integrity": "sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz", + "integrity": "sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==", "dev": true, "dependencies": { "call-bind": "^1.0.7", @@ -2296,6 +2322,7 @@ "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "globalthis": "^1.0.4", + "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.3", "has-symbols": "^1.0.3", @@ -2341,13 +2368,13 @@ } }, "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" }, "engines": { "node": ">= 0.4" @@ -3174,9 +3201,9 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", + "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", "dev": true }, "node_modules/for-each": { @@ -3441,9 +3468,9 @@ } }, "node_modules/globals": { - "version": "15.11.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.11.0.tgz", - "integrity": "sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==", + "version": "15.13.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.13.0.tgz", + "integrity": "sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==", "dev": true, "engines": { "node": ">=18" @@ -3468,11 +3495,11 @@ } }, "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dependencies": { - "get-intrinsic": "^1.1.3" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3517,9 +3544,12 @@ } }, "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.1.0.tgz", + "integrity": "sha512-QLdzI9IIO1Jg7f9GT1gXpPpXArAn6cS31R1eEZqz08Gc+uQ8/XiqHWt17Fiw+2p6oTTIq5GXEpQkAlA88YRl/Q==", + "dependencies": { + "call-bind": "^1.0.7" + }, "engines": { "node": ">= 0.4" }, @@ -3528,9 +3558,9 @@ } }, "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "engines": { "node": ">= 0.4" }, @@ -3693,9 +3723,9 @@ } }, "node_modules/husky": { - "version": "9.1.6", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", - "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "bin": { "husky": "bin.js" @@ -3840,7 +3870,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", - "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -3852,11 +3881,14 @@ } }, "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", "dependencies": { - "has-bigints": "^1.0.1" + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3875,12 +3907,12 @@ } }, "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.0.tgz", + "integrity": "sha512-kR5g0+dXf/+kXnqI+lu0URKYPKgICtHGGNCDSB10AaUFj3o/HkB3u7WfpRBJGFopxxY0oH3ux7ZsDjLtK7xqvw==", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bind": "^1.0.7", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -3952,12 +3984,14 @@ } }, "node_modules/is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", - "dev": true, + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz", + "integrity": "sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA==", "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3975,7 +4009,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -4007,7 +4040,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -4036,11 +4068,12 @@ } }, "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.0.tgz", + "integrity": "sha512-KVSZV0Dunv9DTPkhXwcZ3Q+tUc9TsaE1ZwX5J2WMvsSGS6Md8TFPun5uwh0yRdrNerI6vf/tbJxqSx4c1ZI1Lw==", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bind": "^1.0.7", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -4068,12 +4101,14 @@ } }, "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.0.tgz", + "integrity": "sha512-B6ohK4ZmoftlUe+uvenXSbPJFo6U37BH7oO1B3nQH8f/7h27N56s85MhUtbFJAziz5dcmuR3i8ovUl35zp8pFA==", "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bind": "^1.0.7", + "gopd": "^1.1.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -4086,7 +4121,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -4121,11 +4155,12 @@ } }, "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.0.tgz", + "integrity": "sha512-PlfzajuF9vSo5wErv3MJAKD/nqf9ngAs1NFQYm16nUYFO2IzxJ2hcm+IOCg+EEopdykNNUhVq5cz35cAUxU8+g==", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bind": "^1.0.7", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -4135,11 +4170,13 @@ } }, "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.0.tgz", + "integrity": "sha512-qS8KkNNXUZ/I+nX6QT8ZS1/Yx0A444yhzdTKxCzKkNjQ9sHErBxJnJAgh+f5YhusYECEcjo4XcyH87hn6+ks0A==", "dependencies": { - "has-symbols": "^1.0.2" + "call-bind": "^1.0.7", + "has-symbols": "^1.0.3", + "safe-regex-test": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -4184,7 +4221,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -4207,7 +4243,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", - "dev": true, "dependencies": { "call-bind": "^1.0.7", "get-intrinsic": "^1.2.4" @@ -4817,9 +4852,9 @@ } }, "node_modules/micromark-util-character": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz", - "integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz", + "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==", "dev": true, "funding": [ { @@ -4837,9 +4872,9 @@ } }, "node_modules/micromark-util-encode": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz", - "integrity": "sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz", + "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==", "dev": true, "funding": [ { @@ -4853,9 +4888,9 @@ ] }, "node_modules/micromark-util-sanitize-uri": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz", - "integrity": "sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz", + "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==", "dev": true, "funding": [ { @@ -4874,9 +4909,9 @@ } }, "node_modules/micromark-util-symbol": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz", - "integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz", + "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==", "dev": true, "funding": [ { @@ -4890,9 +4925,9 @@ ] }, "node_modules/micromark-util-types": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.0.tgz", - "integrity": "sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.1.tgz", + "integrity": "sha512-534m2WhVTddrcKVepwmVEVnUAmtrx9bfIjNoQHRqfnvdaHQiFytEhJoTgpWJvDEXCO5gLTQh3wYC1PgOJA4NSQ==", "dev": true, "funding": [ { @@ -5268,9 +5303,9 @@ } }, "node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz", + "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", @@ -5487,9 +5522,9 @@ } }, "node_modules/npm-run-all/node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", + "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", "dependencies": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -5804,9 +5839,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", - "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "engines": { "node": ">= 0.4" }, @@ -5911,16 +5946,15 @@ "wrappy": "1" } }, - "node_modules/oniguruma-to-js": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/oniguruma-to-js/-/oniguruma-to-js-0.4.3.tgz", - "integrity": "sha512-X0jWUcAlxORhOqqBREgPMgnshB7ZGYszBNspP+tS9hPD3l13CdaXcHbgImoHUHlrvGx/7AvFEkTRhAGYh+jzjQ==", + "node_modules/oniguruma-to-es": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-0.7.0.tgz", + "integrity": "sha512-HRaRh09cE0gRS3+wi2zxekB+I5L8C/gN60S+vb11eADHUaB/q4u8wGGOX3GvwvitG8ixaeycZfeoyruKQzUgNg==", "dev": true, "dependencies": { - "regex": "^4.3.2" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" + "emoji-regex-xs": "^1.0.0", + "regex": "^5.0.2", + "regex-recursion": "^4.3.0" } }, "node_modules/optionator": { @@ -6356,9 +6390,9 @@ } }, "node_modules/process-on-spawn": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", - "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz", + "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==", "dev": true, "dependencies": { "fromentries": "^1.2.0" @@ -6493,18 +6527,17 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", - "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", - "dev": true, + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz", + "integrity": "sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g==", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.23.1", + "es-abstract": "^1.23.5", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" + "gopd": "^1.0.1", + "which-builtin-type": "^1.1.4" }, "engines": { "node": ">= 0.4" @@ -6514,9 +6547,27 @@ } }, "node_modules/regex": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/regex/-/regex-4.4.0.tgz", - "integrity": "sha512-uCUSuobNVeqUupowbdZub6ggI5/JZkYyJdDogddJr60L764oxC2pMZov1fQ3wM9bdyzUILDG+Sqx6NAKAz9rKQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/regex/-/regex-5.0.2.tgz", + "integrity": "sha512-/pczGbKIQgfTMRV0XjABvc5RzLqQmwqxLHdQao2RTXPk+pmTXB2P0IaUHYdYyk412YLwUIkaeMd5T+RzVgTqnQ==", + "dev": true, + "dependencies": { + "regex-utilities": "^2.3.0" + } + }, + "node_modules/regex-recursion": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-4.3.0.tgz", + "integrity": "sha512-5LcLnizwjcQ2ALfOj95MjcatxyqF5RPySx9yT+PaXu3Gox2vyAtLDjHB8NTJLtMGkvyau6nI3CfpwFCjPUIs/A==", + "dev": true, + "dependencies": { + "regex-utilities": "^2.3.0" + } + }, + "node_modules/regex-utilities": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz", + "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==", "dev": true }, "node_modules/regexp.prototype.flags": { @@ -6819,23 +6870,26 @@ } }, "node_modules/shell-quote": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", - "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz", + "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/shiki": { - "version": "1.22.2", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.22.2.tgz", - "integrity": "sha512-3IZau0NdGKXhH2bBlUk4w1IHNxPh6A5B2sUpyY+8utLu2j/h1QpFkAaUA1bAMxOWWGtTWcAh531vnS4NJKS/lA==", + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.24.0.tgz", + "integrity": "sha512-qIneep7QRwxRd5oiHb8jaRzH15V/S8F3saCXOdjwRLgozZJr5x2yeBhQtqkO3FSzQDwYEFAYuifg4oHjpDghrg==", "dev": true, "dependencies": { - "@shikijs/core": "1.22.2", - "@shikijs/engine-javascript": "1.22.2", - "@shikijs/engine-oniguruma": "1.22.2", - "@shikijs/types": "1.22.2", + "@shikijs/core": "1.24.0", + "@shikijs/engine-javascript": "1.24.0", + "@shikijs/engine-oniguruma": "1.24.0", + "@shikijs/types": "1.24.0", "@shikijs/vscode-textmate": "^9.3.0", "@types/hast": "^3.0.4" } @@ -7441,9 +7495,9 @@ } }, "node_modules/ts-api-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.0.tgz", - "integrity": "sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", + "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==", "dev": true, "engines": { "node": ">=16" @@ -7547,16 +7601,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz", + "integrity": "sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==", "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "is-typed-array": "^1.1.13", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -7566,16 +7621,16 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-proto": "^1.0.3", "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -7616,15 +7671,15 @@ } }, "node_modules/typedoc-plugin-rename-defaults": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/typedoc-plugin-rename-defaults/-/typedoc-plugin-rename-defaults-0.7.1.tgz", - "integrity": "sha512-hgg4mAy5IumgUmPOnVVGmGywjTGtUCmRJ2jRbseqtXdlUuYKj652ODL9joUWFt5uvNu4Dr/pNILc/qsKGHJw+w==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/typedoc-plugin-rename-defaults/-/typedoc-plugin-rename-defaults-0.7.2.tgz", + "integrity": "sha512-9oa1CsMN4p/xuVR2JW2YDD6xE7JcrIth3KAfjR8YBi6NnrDk2Q72o4lbArybLDjxKAkOzk7N1uUdGwJlooLEOg==", "dev": true, "dependencies": { "camelcase": "^8.0.0" }, "peerDependencies": { - "typedoc": ">=0.22.x <0.27.x" + "typedoc": ">=0.22.x <0.28.x" } }, "node_modules/typedoc-plugin-rename-defaults/node_modules/camelcase": { @@ -7677,14 +7732,14 @@ } }, "node_modules/typescript-eslint": { - "version": "8.12.2", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.12.2.tgz", - "integrity": "sha512-UbuVUWSrHVR03q9CWx+JDHeO6B/Hr9p4U5lRH++5tq/EbFq1faYZe50ZSBePptgfIKLEti0aPQ3hFgnPVcd8ZQ==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.17.0.tgz", + "integrity": "sha512-409VXvFd/f1br1DCbuKNFqQpXICoTB+V51afcwG1pn1a3Cp92MqAUges3YjwEdQ0cMUoCIodjVDAYzyD8h3SYA==", "dev": true, "dependencies": { - "@typescript-eslint/eslint-plugin": "8.12.2", - "@typescript-eslint/parser": "8.12.2", - "@typescript-eslint/utils": "8.12.2" + "@typescript-eslint/eslint-plugin": "8.17.0", + "@typescript-eslint/parser": "8.17.0", + "@typescript-eslint/utils": "8.17.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7693,6 +7748,9 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, "peerDependenciesMeta": { "typescript": { "optional": true @@ -7720,9 +7778,9 @@ } }, "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "dev": true }, "node_modules/unique-filename": { @@ -7955,31 +8013,34 @@ } }, "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.0.tgz", + "integrity": "sha512-Ei7Miu/AXe2JJ4iNF5j/UphAgRoma4trE6PtisM09bPygb3egMH3YLW/befsWb1A1AxvNSFidOFTB18XtnIIng==", "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.0", + "is-number-object": "^1.1.0", + "is-string": "^1.1.0", + "is-symbol": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/which-builtin-type": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", - "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.0.tgz", + "integrity": "sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==", "dependencies": { + "call-bind": "^1.0.7", "function.prototype.name": "^1.1.6", "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", + "is-finalizationregistry": "^1.1.0", "is-generator-function": "^1.0.10", "is-regex": "^1.1.4", "is-weakref": "^1.0.2", @@ -7999,7 +8060,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", - "dev": true, "dependencies": { "is-map": "^2.0.3", "is-set": "^2.0.3", @@ -8020,9 +8080,9 @@ "dev": true }, "node_modules/which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.16.tgz", + "integrity": "sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==", "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", @@ -8200,9 +8260,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz", - "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", + "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", "dev": true, "bin": { "yaml": "bin.mjs" diff --git a/package.json b/package.json index e7031e2d6..8f7143bc5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aerospike", - "version": "5.13.2", + "version": "5.13.2-dev1", "description": "Aerospike Client Library", "keywords": [ "aerospike", diff --git a/ts-test/package-lock.json b/ts-test/package-lock.json index afae7e3cf..36073f526 100644 --- a/ts-test/package-lock.json +++ b/ts-test/package-lock.json @@ -25,7 +25,7 @@ }, "..": { "name": "aerospike", - "version": "5.12.1", + "version": "5.13.2", "cpu": [ "x64", "arm64" @@ -41,12 +41,12 @@ "ansi-colors": "^4.1.3", "bindings": "^1.5.0", "minimatch": "^3.1.2", - "nan": "^2.19.0", + "nan": "^2.22.0", "node-gyp": "^10.1.0", "npm-run-all": "^4.1.5" }, "devDependencies": { - "@eslint/js": "^9.11.1", + "@eslint/js": "^9.12.0", "@mapbox/node-pre-gyp": "^1.0.11", "@types/node": "^22.7.4", "chai": "^4.4.1", @@ -54,7 +54,7 @@ "codecov": "^3.8.3", "deep-eql": "^4.1.3", "eslint": "^8.57.1", - "globals": "^15.9.0", + "globals": "^15.11.0", "husky": "^9.0.11", "mocha": "^10.4.0", "mocha-clean": "^1.0.0", @@ -63,8 +63,10 @@ "semver": "^7.6.0", "standard": "^17.1.0", "tmp": "^0.2.3", + "typedoc": "^0.26.7", + "typedoc-plugin-rename-defaults": "^0.7.1", "typescript": "^5.6.2", - "typescript-eslint": "^8.7.0", + "typescript-eslint": "^8.8.1", "yargs": "^17.7.2" }, "engines": { From a8ff6d0d6392029425585dca70b764c9dca959c0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 4 Dec 2024 09:57:26 -0700 Subject: [PATCH 048/417] Pipeline improvements --- .github/workflows/build-bindings.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 42835ce5b..328215c1f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -190,18 +190,18 @@ jobs: if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} uses: ./.github/actions/setup-docker-on-macos - #- name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' - # if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} - # uses: ./.github/actions/run-ee-server-for-ext-container - # with: - # use-server-rc: ${{ inputs.use-server-rc }} - # server-tag: ${{ inputs.server-tag }} - # docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} - # docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} + uses: ./.github/actions/run-ee-server-for-ext-container + with: + use-server-rc: ${{ inputs.use-server-rc }} + server-tag: ${{ inputs.server-tag }} + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} # TODO: combine this composite action and the above into one - name: "Linux: run Aerospike server in Docker container and configure config.conf to connect to the server container's Docker IP address" - # if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} uses: ./.github/actions/run-ee-server-for-ext-container with: use-server-rc: ${{ inputs.use-server-rc }} From 7c0167aecb3f4e7354124006d3add4412e9c0316 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 4 Dec 2024 11:45:05 -0700 Subject: [PATCH 049/417] Pipeline improvements --- .github/workflows/bump-version.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 22fef3397..bf2a06df2 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -57,6 +57,10 @@ jobs: id: get-current-version run: echo current_version=$(node -e "console.log(require('./package.json').version);") >> $GITHUB_OUTPUT + - name: Print current version + run: echo "Current version is: ${{ steps.get-current-version.outputs.current_version }}" + + get-new-version: runs-on: ubuntu-22.04 needs: get-current-version @@ -74,6 +78,11 @@ jobs: - name: Get new version id: get-new-version run: echo new_version=$(node bump-dev-num.js) >> $GITHUB_OUTPUT + working-directory: .github/workflows + + - name: Print new version + run: echo "New version is: ${{ steps.get-current-version.outputs.new_version }}" + update-version-in-repo: needs: get-new-version From 9201500ae4ea9935a2fc5ed53400e8ec66b4c80c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 4 Dec 2024 12:30:31 -0700 Subject: [PATCH 050/417] Pipeline improvements --- .github/workflows/bump-version.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index bf2a06df2..57de0e541 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -55,10 +55,12 @@ jobs: - name: Get current version id: get-current-version - run: echo current_version=$(node -e "console.log(require('./package.json').version);") >> $GITHUB_OUTPUT + run: | + echo current_version=$(node -e "console.log(require('./package.json').version);") >> $GITHUB_OUTPUT + echo "current_version=$current_version" >> $GITHUB_OUTPUT - - name: Print current version - run: echo "Current version is: ${{ steps.get-current-version.outputs.current_version }}" + #- name: Print current version + # run: echo "Current version is: ${{ steps.get-current-version.outputs.current_version }}" get-new-version: @@ -77,11 +79,13 @@ jobs: - name: Get new version id: get-new-version - run: echo new_version=$(node bump-dev-num.js) >> $GITHUB_OUTPUT + run: | + echo new_version=$(node bump-dev-num.js) >> $GITHUB_OUTPUT + echo "new_version=$new_version" >> $GITHUB_OUTPUT working-directory: .github/workflows - - name: Print new version - run: echo "New version is: ${{ steps.get-current-version.outputs.new_version }}" + #- name: Print new version + # run: echo "New version is: ${{ steps.get-current-version.outputs.new_version }}" update-version-in-repo: From 0313409ee9b7b8b802cbdbab43ec39cb1642b399 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 2 Jan 2025 17:53:01 -0700 Subject: [PATCH 051/417] CI/CD Improvements --- .github/workflows/bump-dev-num.js | 24 +++++++++---------- .../workflows/docker-build-context/Dockerfile | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bump-dev-num.js b/.github/workflows/bump-dev-num.js index 138efe875..7e5555418 100644 --- a/.github/workflows/bump-dev-num.js +++ b/.github/workflows/bump-dev-num.js @@ -1,25 +1,25 @@ -const semver = require('semver'); +const semver = require('semver') -const versionString = process.argv[2]; -let version = semver.parse(versionString); +const versionString = process.argv[2] +const version = semver.parse(versionString) if (!version) { - console.error("Invalid version string"); - process.exit(1); + console.error('Invalid version string') + process.exit(1) } if (version.prerelease.includes('dev')) { // Increment the dev release number - version.inc('prerelease', 'dev'); + version.inc('prerelease', 'dev') } else if (version.prerelease.includes('rc')) { // Increment the RC number - version.inc('prerelease', 'rc'); - version.prerelease[1] = 1; // Ensure dev number starts at 1 + version.inc('prerelease', 'rc') + version.prerelease[1] = 1 // Ensure dev number starts at 1 } else { // Assume this is a release version - version.inc('minor'); // Bump to next minor version - version.prerelease = ['rc', 1]; // Start RC numbers from 1 - version.format(); // Apply changes + version.inc('minor') // Bump to next minor version + version.prerelease = ['rc', 1] // Start RC numbers from 1 + version.format() // Apply changes } -console.log(version.version); +console.log(version.version) diff --git a/.github/workflows/docker-build-context/Dockerfile b/.github/workflows/docker-build-context/Dockerfile index f2af08d07..142c78aa1 100644 --- a/.github/workflows/docker-build-context/Dockerfile +++ b/.github/workflows/docker-build-context/Dockerfile @@ -1,4 +1,4 @@ -ARG server_image=aerospike/aerospike-server-enterprise +ARG server_image=aerospike/aerospike-server-enterprise:8.0.0.0-rc1 ARG ROSTER_FILE_NAME=roster.smd # Temp file for passing node id from one build stage to another # Docker doesn't support command substitution for setting values for ARG variables, so we have to do this From db29e11f2ea0c3f5e3e0be390f943d6e6cca66fc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 2 Jan 2025 18:43:33 -0700 Subject: [PATCH 052/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 57de0e541..eb0e3ae62 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -56,8 +56,8 @@ jobs: - name: Get current version id: get-current-version run: | - echo current_version=$(node -e "console.log(require('./package.json').version);") >> $GITHUB_OUTPUT - echo "current_version=$current_version" >> $GITHUB_OUTPUT + echo current_version=$(node -p "require('./package.json').version") >> $GITHUB_OUTPUT + # echo "current_version=$current_version" >> $GITHUB_OUTPUT #- name: Print current version # run: echo "Current version is: ${{ steps.get-current-version.outputs.current_version }}" From 5a4807b0ca96f08f8219fab4d8856e938ddf7334 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 2 Jan 2025 20:59:32 -0700 Subject: [PATCH 053/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 8 +- .github/workflows/tests.yml | 456 +++++++++++ package-lock.json | 1172 +++++++++++++++------------- package.json | 11 +- ts-test/package-lock.json | 20 +- 5 files changed, 1128 insertions(+), 539 deletions(-) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index eb0e3ae62..5fc4064e7 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -56,11 +56,11 @@ jobs: - name: Get current version id: get-current-version run: | - echo current_version=$(node -p "require('./package.json').version") >> $GITHUB_OUTPUT - # echo "current_version=$current_version" >> $GITHUB_OUTPUT + echo "current_version=$(node -p \"require('./package.json').version\")" >> $GITHUB_OUTPUT + + - name: Print current version + run: echo "Current version is: ${{ steps.get-current-version.outputs.current_version }}" - #- name: Print current version - # run: echo "Current version is: ${{ steps.get-current-version.outputs.current_version }}" get-new-version: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 000000000..7a9ba295b --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,456 @@ +name: PR pre-merge tests + +env: + LOWEST_SUPPORTED_NODEJS_VERSION: '18' + LOWEST_SUPPORTED_NODE_MODULE: 'v108' + +# Trigger test workflow whenever: +# 1. A pull request is updated (e.g with new commits) +# 2. Commits are pushed directly to the stage or master branch +on: + push: + branches: ["stage", "master"] + pull_request: + branches: ["stage", "master"] + types: [ + # Default triggers + opened, + synchronize, + reopened, + # Additional triggers + labeled, + unlabeled + ] + workflow_dispatch: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - name: install standard + run: npm install standard + + - name: lint + run: npm run lint + + build-ubuntu: + runs-on: ubuntu-latest + strategy: + matrix: + nodejs-version: ["18", "20", "22", "23"] + fail-fast: false + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.nodejs-version }} + architecture: 'x64' + - name: debugging + run: | + echo "LOWEST_SUPPORTED_NODEJS_VERSION: $LOWEST_SUPPORTED_NODEJS_VERSION" + + - run: sudo apt update + - name: Install build dependencies (C Client dependency packages) + run: sudo apt install g++ libssl-dev zlib1g-dev; + - name: Install build dependencies (make) + run: sudo apt-get install -y make; + - name: Install build dependencies (make) + run: sudo apt install build-essential; + + - name: Build client + run: | + ./scripts/build-c-client.sh + npm install + env: + CFLAGS: '-Werror' + + - name: list + run: ls lib/binding + - name: Send binding to test jobs + uses: actions/upload-artifact@v4 + with: + name: binding-${{ matrix.nodejs-version }} + path: ./lib/binding/node-*-linux-x64/ + +# test-memray: +# needs: build-ubuntu +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# +# - uses: actions/setup-node@v4 +# with: +# node-version: ${{ matrix.nodejs-version }} +# architecture: 'x64' +# +# - uses: actions/download-artifact@v4 +# with: +# name: binding-18 +# +# - name: make binding folder +# run: mkdir lib/binding +# +# - name: Install client +# run: cp -r install node-v108-linux-x64 lib/binding/node-v108-linux-x64 +# +# - name: Install client +# run: npm install . +# +# - name: Run Aerospike server +# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server +# +# - name: Wait for database to be ready +# # Should be ready after 3 seconds +# run: sleep 3 +# +# - name: Get number of tests +# run: echo "NUM_TESTS=$(npm run test-dry-run | grep -oP '\d+ (passing|pending)' | awk '{ sum += $1 } END { print sum }')" >> $GITHUB_ENV +# working-directory: test +# +# - name: Run tests +# # Get number of tests since setting to 0 doesn't work properly +# # pytest-memray currently throws a ZeroDivision error due to having a bug +# # We ignore this for now +# run: python -m pytest ./new_tests --memray --memray-bin-path=./ --most-allocations=${{ env.NUM_TESTS }} || true +# working-directory: test + + # Run this when testing new server features on server release candidate + # to make sure the tests don't regress on the last server release. + test-ce-latest-release: + runs-on: ubuntu-latest + if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + needs: build-ubuntu + + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + - name: debugging + run: | + echo "LOWEST_SUPPORTED_NODEJS_VERSION: $LOWEST_SUPPORTED_NODEJS_VERSION" + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + architecture: 'x64' + + - uses: actions/download-artifact@v4 + with: + name: binding-${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + env: + LOWEST_SUPPORTED_NODEJS_VERSION: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + + + - name: make binding folder + run: mkdir lib/binding + + - name: Install client + run: cp -r node-${{ env.LOWEST_SUPPORTED_NODE_MODULE }}-linux-x64 lib/binding/node-${{ env.LOWEST_SUPPORTED_NODE_MODULE }}-linux-x64 + + - name: Run Aerospike server + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server + + - name: Wait for database to be ready + # Should be ready after 3 seconds + run: sleep 3 + + - name: Run tests + run: npm run test + + test-ce: + runs-on: ubuntu-latest + needs: build-ubuntu + strategy: + matrix: + node-version: [ + "18", + "20", + "22", + "23" + ] + fail-fast: false + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + architecture: 'x64' + + - uses: actions/download-artifact@v4 + with: + name: binding-${{ matrix.node-version }} + + - name: make binding folder + run: mkdir lib/binding + + - name: install mocha + run: npm install mocha + + - name: Install client + #fix the convention here + run: | + if [ "${{ matrix.node-version }}" = "18" ]; then + cp -r node-v108-linux-x64 lib/binding/node-v108-linux-x64 + elif [ "${{ matrix.node-version }}" = "20" ]; then + cp -r node-v115-linux-x64 lib/binding/node-v115-linux-x64 + elif [ "${{ matrix.node-version }}" = "22" ]; then + cp -r node-v127-linux-x64 lib/binding/node-v127-linux-x64 + elif [ "${{ matrix.node-version }}" = "23" ]; then + cp -r node-v131-linux-x64 lib/binding/node-v131-linux-x64 + fi + + - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Run Aerospike server release candidate with latest tag + if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest + + - name: Run Aerospike server + if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/mail/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file /etc/mail/aerospike.conf + + - name: Wait for database to be ready + # Should be ready after 3 seconds + run: sleep 3 + + - name: Run tests + run: | + cd ts-test; + npm install typescript --save-dev; + npx tsc; + cd ..; + npm run test + + test-lowest-supported-server: + runs-on: ubuntu-latest + needs: build-ubuntu + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + architecture: 'x64' + + - uses: actions/download-artifact@v4 + with: + name: binding-${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + env: + LOWEST_SUPPORTED_NODEJS_VERSION: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + + - name: make binding folder + run: mkdir lib/binding + + - name: install mocha + run: npm install mocha + + - name: Install client + #fix the convention here + run: cp -r node-${{ env.LOWEST_SUPPORTED_NODE_MODULE }}-linux-x64 lib/binding/node-${{ env.LOWEST_SUPPORTED_NODE_MODULE }}-linux-x64 + + - name: Run lowest supported server + run: | + SERVER_VERSION=$(curl -s "https://registry.hub.docker.com/v2/repositories/aerospike/aerospike-server/tags?page_size=100" | jq '.results[] | select(.name | startswith("6.1")).name' -r | head -n 1) + docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server:$SERVER_VERSION + + - name: Wait for database to be ready + # Should be ready after 3 seconds + run: sleep 3 + + - name: Run tests + run: | + cd ts-test; + npm install typescript --save-dev; + npx tsc; + cd ..; + npm run test -- --t 20000 + + test-ee: + runs-on: ubuntu-latest + needs: build-ubuntu + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + architecture: 'x64' + + - uses: actions/download-artifact@v4 + with: + name: binding-${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + env: + LOWEST_SUPPORTED_NODEJS_VERSION: ${{ env.LOWEST_SUPPORTED_NODEJS_VERSION }} + + - name: make binding folder + run: mkdir lib/binding + + - name: install mocha + run: npm install mocha + + - name: Install client + #fix the convention here + run: cp -r node-${{ env.LOWEST_SUPPORTED_NODE_MODULE }}-linux-x64 lib/binding/node-${{ env.LOWEST_SUPPORTED_NODE_MODULE }}-linux-x64 + + - name: Download aerospike-client-python repository + run: git clone https://github.com/aerospike/aerospike-client-python.git + + - name: debugging + run: | + ls; + ls .github; + docker ps; + + - name: Run ee server + uses: ./.github/actions/run-ee-server + with: + use-server-rc: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + + - name: Wait for server to start + run: sleep 5 + + - name: Run tests + run: | + cd ts-test; + npm install typescript --save-dev; + npx tsc; + cd ..; + npm run test -- --h localhost --U superuser --P superuser --t 40000 + + test-valgrind: + runs-on: ubuntu-latest + needs: build-ubuntu + strategy: + matrix: + node-version: [ + "20", + ] + fail-fast: false + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + architecture: 'x64' + + - uses: actions/download-artifact@v4 + with: + name: binding-${{ matrix.node-version }} + + - name: make binding folder + run: mkdir lib/binding + + - name: install mocha + run: npm install mocha + + - name: install valgrind + run: | + sudo apt-get update; + sudo apt update; + sudo apt install valgrind; + + - name: Install client + #fix the convention here + run: | + cp -r node-v115-linux-x64 lib/binding/node-v115-linux-x64 + + - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} + password: ${{ secrets.DOCKER_HUB_BOT_PW }} + + - name: Run Aerospike server release candidate with latest tag + if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest + + - name: Run Aerospike server + if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} + run: docker run -d -v $(pwd)/.github/assets/aerospike.conf:/etc/mail/aerospike.conf --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server --config-file /etc/mail/aerospike.conf + + - name: Wait for database to be ready + # Should be ready after 3 seconds + run: sleep 3 + + - name: Run tests + run: npm run valgrind -- --t 40000 + +# test-typescript: +# runs-on: ubuntu-latest +# needs: build-ubuntu +# strategy: +# matrix: +# node-version: [ +# "20", +# ] +# fail-fast: false +# +# steps: +# - uses: actions/checkout@v2 +# with: +# submodules: recursive +# +# - uses: actions/setup-node@v4 +# with: +# node-version: ${{ matrix.node-version }} +# architecture: 'x64' +# +# - uses: actions/download-artifact@v4 +# with: +# name: binding-${{ matrix.node-version }} +# +# - name: make binding folder +# run: mkdir lib/binding +# +# - name: Install client +# run: | +# cp -r node-v115-linux-x64 lib/binding/node-v115-linux-x64 +# +# - if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} +# password: ${{ secrets.DOCKER_HUB_BOT_PW }} +# +# - name: Run Aerospike server release candidate with latest tag +# if: ${{ contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server-rc:latest +# +# - name: Run Aerospike server +# if: ${{ !contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# run: docker run -d --name aerospike -p 3000-3002:3000-3002 aerospike/aerospike-server +# +# - name: Modify the package.json +# run: | +# mkdir my-aerospike-project +# cd my-aerospike-project +# npm init -y +# npm install typescript ts-node --save-dev +# npm install .. +# cp ../examples/typescript.ts index.ts +# npx tsc index.ts +# node index.js \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 46a60309c..b96ea9745 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "aerospike", - "version": "5.13.2-dev1", + "version": "6.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aerospike", - "version": "5.13.2-dev1", + "version": "6.0.1", "cpu": [ "x64", "arm64" @@ -291,9 +291,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.3.tgz", - "integrity": "sha512-yTmc8J+Sj8yLzwr4PD5Xb/WF3bOYu2C2OoSZPzbuqRm4n98XirsbzaX+GloeO376UnSYIYJ4NCanwV5/ugZkwA==", + "version": "7.26.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz", + "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.26.2", @@ -426,9 +426,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.16.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz", - "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==", + "version": "9.17.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz", + "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -645,9 +645,9 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", + "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, "dependencies": { "@jridgewell/set-array": "^1.2.1", @@ -763,22 +763,19 @@ } }, "node_modules/@npmcli/agent/node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", - "dependencies": { - "debug": "^4.3.4" - }, + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", "engines": { "node": ">= 14" } }, "node_modules/@npmcli/agent/node_modules/https-proxy-agent": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", - "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", "dependencies": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.2", "debug": "4" }, "engines": { @@ -812,54 +809,54 @@ "dev": true }, "node_modules/@shikijs/core": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.24.0.tgz", - "integrity": "sha512-6pvdH0KoahMzr6689yh0QJ3rCgF4j1XsXRHNEeEN6M4xJTfQ6QPWrmHzIddotg+xPJUPEPzYzYCKzpYyhTI6Gw==", + "version": "1.24.4", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.24.4.tgz", + "integrity": "sha512-jjLsld+xEEGYlxAXDyGwWsKJ1sw5Pc1pnp4ai2ORpjx2UX08YYTC0NNqQYO1PaghYaR+PvgMOGuvzw2he9sk0Q==", "dev": true, "dependencies": { - "@shikijs/engine-javascript": "1.24.0", - "@shikijs/engine-oniguruma": "1.24.0", - "@shikijs/types": "1.24.0", - "@shikijs/vscode-textmate": "^9.3.0", + "@shikijs/engine-javascript": "1.24.4", + "@shikijs/engine-oniguruma": "1.24.4", + "@shikijs/types": "1.24.4", + "@shikijs/vscode-textmate": "^9.3.1", "@types/hast": "^3.0.4", - "hast-util-to-html": "^9.0.3" + "hast-util-to-html": "^9.0.4" } }, "node_modules/@shikijs/engine-javascript": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.24.0.tgz", - "integrity": "sha512-ZA6sCeSsF3Mnlxxr+4wGEJ9Tto4RHmfIS7ox8KIAbH0MTVUkw3roHPHZN+LlJMOHJJOVupe6tvuAzRpN8qK1vA==", + "version": "1.24.4", + "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.24.4.tgz", + "integrity": "sha512-TClaQOLvo9WEMJv6GoUsykQ6QdynuKszuORFWCke8qvi6PeLm7FcD9+7y45UenysxEWYpDL5KJaVXTngTE+2BA==", "dev": true, "dependencies": { - "@shikijs/types": "1.24.0", - "@shikijs/vscode-textmate": "^9.3.0", - "oniguruma-to-es": "0.7.0" + "@shikijs/types": "1.24.4", + "@shikijs/vscode-textmate": "^9.3.1", + "oniguruma-to-es": "0.8.1" } }, "node_modules/@shikijs/engine-oniguruma": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.0.tgz", - "integrity": "sha512-Eua0qNOL73Y82lGA4GF5P+G2+VXX9XnuUxkiUuwcxQPH4wom+tE39kZpBFXfUuwNYxHSkrSxpB1p4kyRW0moSg==", + "version": "1.24.4", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.4.tgz", + "integrity": "sha512-Do2ry6flp2HWdvpj2XOwwa0ljZBRy15HKZITzPcNIBOGSeprnA8gOooA/bLsSPuy8aJBa+Q/r34dMmC3KNL/zw==", "dev": true, "dependencies": { - "@shikijs/types": "1.24.0", - "@shikijs/vscode-textmate": "^9.3.0" + "@shikijs/types": "1.24.4", + "@shikijs/vscode-textmate": "^9.3.1" } }, "node_modules/@shikijs/types": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.24.0.tgz", - "integrity": "sha512-aptbEuq1Pk88DMlCe+FzXNnBZ17LCiLIGWAeCWhoFDzia5Q5Krx3DgnULLiouSdd6+LUM39XwXGppqYE0Ghtug==", + "version": "1.24.4", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.24.4.tgz", + "integrity": "sha512-0r0XU7Eaow0PuDxuWC1bVqmWCgm3XqizIaT7SM42K03vc69LGooT0U8ccSR44xP/hGlNx4FKhtYpV+BU6aaKAA==", "dev": true, "dependencies": { - "@shikijs/vscode-textmate": "^9.3.0", + "@shikijs/vscode-textmate": "^9.3.1", "@types/hast": "^3.0.4" } }, "node_modules/@shikijs/vscode-textmate": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.3.0.tgz", - "integrity": "sha512-jn7/7ky30idSkd/O5yDBfAnVt+JJpepofP/POZ1iMOxK59cOfqIgg/Dj0eFsjOTMw+4ycJN0uhZH/Eb0bs/EUA==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.3.1.tgz", + "integrity": "sha512-79QfK1393x9Ho60QFyLti+QfdJzRQCVLFb97kOIV7Eo9vQU/roINgk7m24uv0a7AUvN//RDH36FLjjK48v0s9g==", "dev": true }, "node_modules/@tootallnate/once": { @@ -896,9 +893,9 @@ } }, "node_modules/@types/node": { - "version": "22.10.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.1.tgz", - "integrity": "sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==", + "version": "22.10.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz", + "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==", "dev": true, "dependencies": { "undici-types": "~6.20.0" @@ -911,16 +908,16 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.17.0.tgz", - "integrity": "sha512-HU1KAdW3Tt8zQkdvNoIijfWDMvdSweFYm4hWh+KwhPstv+sCmWb89hCIP8msFm9N1R/ooh9honpSuvqKWlYy3w==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz", + "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.17.0", - "@typescript-eslint/type-utils": "8.17.0", - "@typescript-eslint/utils": "8.17.0", - "@typescript-eslint/visitor-keys": "8.17.0", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/type-utils": "8.19.0", + "@typescript-eslint/utils": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -935,24 +932,20 @@ }, "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.17.0.tgz", - "integrity": "sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz", + "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "8.17.0", - "@typescript-eslint/types": "8.17.0", - "@typescript-eslint/typescript-estree": "8.17.0", - "@typescript-eslint/visitor-keys": "8.17.0", + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4" }, "engines": { @@ -963,22 +956,18 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.17.0.tgz", - "integrity": "sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", + "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.17.0", - "@typescript-eslint/visitor-keys": "8.17.0" + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -989,13 +978,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.17.0.tgz", - "integrity": "sha512-q38llWJYPd63rRnJ6wY/ZQqIzPrBCkPdpIsaCfkR3Q4t3p6sb422zougfad4TFW9+ElIFLVDzWGiGAfbb/v2qw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz", + "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "8.17.0", - "@typescript-eslint/utils": "8.17.0", + "@typescript-eslint/typescript-estree": "8.19.0", + "@typescript-eslint/utils": "8.19.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -1007,18 +996,14 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.17.0.tgz", - "integrity": "sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", + "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1029,13 +1014,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.17.0.tgz", - "integrity": "sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", + "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.17.0", - "@typescript-eslint/visitor-keys": "8.17.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/visitor-keys": "8.19.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -1050,10 +1035,8 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "peerDependencies": { + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { @@ -1081,15 +1064,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.17.0.tgz", - "integrity": "sha512-bQC8BnEkxqG8HBGKwG9wXlZqg37RKSMY7v/X8VEWD8JG2JuTHuNK0VFvMPMUKQcbk6B+tf05k+4AShAEtCtJ/w==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz", + "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.17.0", - "@typescript-eslint/types": "8.17.0", - "@typescript-eslint/typescript-estree": "8.17.0" + "@typescript-eslint/scope-manager": "8.19.0", + "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/typescript-estree": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1099,21 +1082,17 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.17.0.tgz", - "integrity": "sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", + "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.17.0", + "@typescript-eslint/types": "8.19.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -1137,9 +1116,9 @@ } }, "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.1.tgz", + "integrity": "sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==", "dev": true }, "node_modules/abbrev": { @@ -1307,12 +1286,12 @@ } }, "node_modules/array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", "dependencies": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" }, "engines": { "node": ">= 0.4" @@ -1382,15 +1361,15 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", - "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -1400,15 +1379,15 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -1434,18 +1413,17 @@ } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", - "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", "dependencies": { "array-buffer-byte-length": "^1.0.1", - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.2.1", - "get-intrinsic": "^1.2.3", - "is-array-buffer": "^3.0.4", - "is-shared-array-buffer": "^1.0.2" + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" }, "engines": { "node": ">= 0.4" @@ -1530,9 +1508,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.24.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", - "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", + "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", "dev": true, "funding": [ { @@ -1549,9 +1527,9 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001669", - "electron-to-chromium": "^1.5.41", - "node-releases": "^2.0.18", + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.1" }, "bin": { @@ -1675,15 +1653,41 @@ } }, "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", "dependencies": { + "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -1711,9 +1715,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001686", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz", - "integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==", + "version": "1.0.30001690", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", + "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", "dev": true, "funding": [ { @@ -1971,13 +1975,13 @@ } }, "node_modules/data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -1987,27 +1991,27 @@ } }, "node_modules/data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" }, "engines": { "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/inspect-js" } }, "node_modules/data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-data-view": "^1.0.1" }, @@ -2019,9 +2023,9 @@ } }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "dependencies": { "ms": "^2.1.3" }, @@ -2166,15 +2170,28 @@ "node": ">=6.0.0" } }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/electron-to-chromium": { - "version": "1.5.68", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.68.tgz", - "integrity": "sha512-FgMdJlma0OzUYlbrtZ4AeXjKxKPk6KT8WOP8BjcqxWtlg8qyJQjRzPJzUtUn5GBg1oQ26hFs7HOOHJMYiJRnvQ==", + "version": "1.5.76", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz", + "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==", "dev": true }, "node_modules/emoji-regex": { @@ -2231,56 +2248,59 @@ } }, "node_modules/es-abstract": { - "version": "1.23.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz", - "integrity": "sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==", + "version": "1.23.8", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.8.tgz", + "integrity": "sha512-lfab8IzDn6EpI1ibZakcgS6WsfEBiB+43cuJo+wgylx1xKXf+Sp+YR3vFuQwC/u3sxYwV8Cxe3B0DpVUu/WiJQ==", "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "arraybuffer.prototype.slice": "^1.0.3", + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "data-view-buffer": "^1.0.1", - "data-view-byte-length": "^1.0.1", - "data-view-byte-offset": "^1.0.0", - "es-define-property": "^1.0.0", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "es-set-tostringtag": "^2.0.3", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.4", - "get-symbol-description": "^1.0.2", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.2.6", + "get-symbol-description": "^1.1.0", "globalthis": "^1.0.4", - "gopd": "^1.0.1", + "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", "hasown": "^2.0.2", - "internal-slot": "^1.0.7", - "is-array-buffer": "^3.0.4", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.13", - "is-weakref": "^1.0.2", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", "object-inspect": "^1.13.3", "object-keys": "^1.1.1", - "object.assign": "^4.1.5", + "object.assign": "^4.1.7", + "own-keys": "^1.0.0", "regexp.prototype.flags": "^1.5.3", - "safe-array-concat": "^1.1.2", - "safe-regex-test": "^1.0.3", - "string.prototype.trim": "^1.2.9", - "string.prototype.trimend": "^1.0.8", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", - "typed-array-buffer": "^1.0.2", - "typed-array-byte-length": "^1.0.1", - "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.6", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.15" + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" }, "engines": { "node": ">= 0.4" @@ -2290,12 +2310,9 @@ } }, "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "engines": { "node": ">= 0.4" } @@ -2309,26 +2326,27 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz", - "integrity": "sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "es-abstract": "^1.23.3", + "es-abstract": "^1.23.6", "es-errors": "^1.3.0", "es-set-tostringtag": "^2.0.3", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", + "get-intrinsic": "^1.2.6", "globalthis": "^1.0.4", - "gopd": "^1.0.1", + "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "iterator.prototype": "^1.1.3", - "safe-array-concat": "^1.1.2" + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" }, "engines": { "node": ">= 0.4" @@ -2708,28 +2726,28 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.37.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz", - "integrity": "sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==", + "version": "7.37.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.3.tgz", + "integrity": "sha512-DomWuTQPFYZwF/7c9W2fkKkStqZmBd3uugfqBYLdkZ3Hii23WzZuOLUskGxB8qkSKqftxEeGL1TB2kMhrce0jA==", "dev": true, "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", - "array.prototype.flatmap": "^1.3.2", + "array.prototype.flatmap": "^1.3.3", "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.1.0", + "es-iterator-helpers": "^1.2.1", "estraverse": "^5.3.0", "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", "object.entries": "^1.1.8", "object.fromentries": "^2.0.8", - "object.values": "^1.2.0", + "object.values": "^1.2.1", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.11", + "string.prototype.matchall": "^4.0.12", "string.prototype.repeat": "^1.0.0" }, "engines": { @@ -3107,9 +3125,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz", + "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -3287,14 +3305,16 @@ } }, "node_modules/function.prototype.name": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "functions-have-names": "^1.2.3" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" }, "engines": { "node": ">= 0.4" @@ -3360,15 +3380,20 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz", + "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==", "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "dunder-proto": "^1.0.0", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -3399,13 +3424,13 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", "dependencies": { - "call-bind": "^1.0.5", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -3468,9 +3493,9 @@ } }, "node_modules/globals": { - "version": "15.13.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.13.0.tgz", - "integrity": "sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==", + "version": "15.14.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", + "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", "dev": true, "engines": { "node": ">=18" @@ -3517,9 +3542,12 @@ "dev": true }, "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3544,11 +3572,11 @@ } }, "node_modules/has-proto": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.1.0.tgz", - "integrity": "sha512-QLdzI9IIO1Jg7f9GT1gXpPpXArAn6cS31R1eEZqz08Gc+uQ8/XiqHWt17Fiw+2p6oTTIq5GXEpQkAlA88YRl/Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", "dependencies": { - "call-bind": "^1.0.7" + "dunder-proto": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -3616,9 +3644,9 @@ } }, "node_modules/hast-util-to-html": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.3.tgz", - "integrity": "sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.4.tgz", + "integrity": "sha512-wxQzXtdbhiwGAUKrnQJXlOPmHnEehzphwkK7aluUPQ+lEc1xefC8pblMgpp2w5ldBTEfveRIrADcrhGIWrlTDA==", "dev": true, "dependencies": { "@types/hast": "^3.0.0", @@ -3699,12 +3727,9 @@ } }, "node_modules/http-proxy-agent/node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", - "dependencies": { - "debug": "^4.3.4" - }, + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", "engines": { "node": ">= 14" } @@ -3817,13 +3842,13 @@ "dev": true }, "node_modules/internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", "dependencies": { "es-errors": "^1.3.0", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" + "hasown": "^2.0.2", + "side-channel": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -3847,12 +3872,13 @@ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" }, "node_modules/is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -3907,11 +3933,11 @@ } }, "node_modules/is-boolean-object": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.0.tgz", - "integrity": "sha512-kR5g0+dXf/+kXnqI+lu0URKYPKgICtHGGNCDSB10AaUFj3o/HkB3u7WfpRBJGFopxxY0oH3ux7ZsDjLtK7xqvw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz", + "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.2", "has-tostringtag": "^1.0.2" }, "engines": { @@ -3933,9 +3959,9 @@ } }, "node_modules/is-core-module": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", - "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dependencies": { "hasown": "^2.0.2" }, @@ -3947,10 +3973,12 @@ } }, "node_modules/is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", "is-typed-array": "^1.1.13" }, "engines": { @@ -3961,11 +3989,12 @@ } }, "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -3984,11 +4013,11 @@ } }, "node_modules/is-finalizationregistry": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.0.tgz", - "integrity": "sha512-qfMdqbAQEwBw78ZyReKnlA8ezmPdb9BemzIIip/JkjaZUhitfXDkkr+3QTboW0JrSXT1QWyYShpvnNHGZ4c4yA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", "dependencies": { - "call-bind": "^1.0.7" + "call-bound": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -4047,17 +4076,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-negative-zero": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -4068,11 +4086,11 @@ } }, "node_modules/is-number-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.0.tgz", - "integrity": "sha512-KVSZV0Dunv9DTPkhXwcZ3Q+tUc9TsaE1ZwX5J2WMvsSGS6Md8TFPun5uwh0yRdrNerI6vf/tbJxqSx4c1ZI1Lw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" }, "engines": { @@ -4101,12 +4119,12 @@ } }, "node_modules/is-regex": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.0.tgz", - "integrity": "sha512-B6ohK4ZmoftlUe+uvenXSbPJFo6U37BH7oO1B3nQH8f/7h27N56s85MhUtbFJAziz5dcmuR3i8ovUl35zp8pFA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", "dependencies": { - "call-bind": "^1.0.7", - "gopd": "^1.1.0", + "call-bound": "^1.0.2", + "gopd": "^1.2.0", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" }, @@ -4129,11 +4147,11 @@ } }, "node_modules/is-shared-array-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", - "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", "dependencies": { - "call-bind": "^1.0.7" + "call-bound": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -4155,11 +4173,11 @@ } }, "node_modules/is-string": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.0.tgz", - "integrity": "sha512-PlfzajuF9vSo5wErv3MJAKD/nqf9ngAs1NFQYm16nUYFO2IzxJ2hcm+IOCg+EEopdykNNUhVq5cz35cAUxU8+g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" }, "engines": { @@ -4170,13 +4188,13 @@ } }, "node_modules/is-symbol": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.0.tgz", - "integrity": "sha512-qS8KkNNXUZ/I+nX6QT8ZS1/Yx0A444yhzdTKxCzKkNjQ9sHErBxJnJAgh+f5YhusYECEcjo4XcyH87hn6+ks0A==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", "dependencies": { - "call-bind": "^1.0.7", - "has-symbols": "^1.0.3", - "safe-regex-test": "^1.0.3" + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -4186,11 +4204,11 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", - "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", "dependencies": { - "which-typed-array": "^1.1.14" + "which-typed-array": "^1.1.16" }, "engines": { "node": ">= 0.4" @@ -4229,23 +4247,26 @@ } }, "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz", + "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==", "dependencies": { - "call-bind": "^1.0.2" + "call-bound": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-weakset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", - "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4" + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -4425,16 +4446,17 @@ } }, "node_modules/iterator.prototype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz", - "integrity": "sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.4.tgz", + "integrity": "sha512-x4WH0BWmrMmg4oHHl+duwubhrvczGlyuGAZu3nvrf0UXOfPu8IhZObFEr7DE/iv01YgVZrsOiRcqw2srkKEDIA==", "dev": true, "dependencies": { - "define-properties": "^1.2.1", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "reflect.getprototypeof": "^1.0.4", - "set-function-name": "^2.0.1" + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "reflect.getprototypeof": "^1.0.8", + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -4479,9 +4501,9 @@ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" }, "node_modules/jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, "bin": { "jsesc": "bin/jsesc" @@ -4807,6 +4829,14 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/mdast-util-to-hast": { "version": "13.2.0", "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz", @@ -5449,9 +5479,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", - "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "dev": true }, "node_modules/nopt": { @@ -5858,13 +5888,15 @@ } }, "node_modules/object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "has-symbols": "^1.0.3", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", "object-keys": "^1.1.1" }, "engines": { @@ -5921,12 +5953,13 @@ } }, "node_modules/object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" }, @@ -5947,14 +5980,14 @@ } }, "node_modules/oniguruma-to-es": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-0.7.0.tgz", - "integrity": "sha512-HRaRh09cE0gRS3+wi2zxekB+I5L8C/gN60S+vb11eADHUaB/q4u8wGGOX3GvwvitG8ixaeycZfeoyruKQzUgNg==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-0.8.1.tgz", + "integrity": "sha512-dekySTEvCxCj0IgKcA2uUCO/e4ArsqpucDPcX26w9ajx+DvMWLc5eZeJaRQkd7oC/+rwif5gnT900tA34uN9Zw==", "dev": true, "dependencies": { "emoji-regex-xs": "^1.0.0", "regex": "^5.0.2", - "regex-recursion": "^4.3.0" + "regex-recursion": "^5.0.0" } }, "node_modules/optionator": { @@ -5974,6 +6007,22 @@ "node": ">= 0.8.0" } }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -6527,17 +6576,18 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.7.tgz", - "integrity": "sha512-bMvFGIUKlc/eSfXNX+aZ+EL95/EgZzuwA0OBPTbZZDEJw/0AkentjMuM1oiRfwHrshqk4RzdgiTg5CcDalXN5g==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.9.tgz", + "integrity": "sha512-r0Ay04Snci87djAsI4U+WNRcSw5S4pOH7qFjd/veA5gC7TbqESR3tcj28ia95L/fYUDw11JKP7uqUKUAfVvV5Q==", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "es-abstract": "^1.23.5", + "dunder-proto": "^1.0.1", + "es-abstract": "^1.23.6", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "which-builtin-type": "^1.1.4" + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "which-builtin-type": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -6547,20 +6597,21 @@ } }, "node_modules/regex": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/regex/-/regex-5.0.2.tgz", - "integrity": "sha512-/pczGbKIQgfTMRV0XjABvc5RzLqQmwqxLHdQao2RTXPk+pmTXB2P0IaUHYdYyk412YLwUIkaeMd5T+RzVgTqnQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/regex/-/regex-5.1.1.tgz", + "integrity": "sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw==", "dev": true, "dependencies": { "regex-utilities": "^2.3.0" } }, "node_modules/regex-recursion": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-4.3.0.tgz", - "integrity": "sha512-5LcLnizwjcQ2ALfOj95MjcatxyqF5RPySx9yT+PaXu3Gox2vyAtLDjHB8NTJLtMGkvyau6nI3CfpwFCjPUIs/A==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-5.1.1.tgz", + "integrity": "sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w==", "dev": true, "dependencies": { + "regex": "^5.1.1", "regex-utilities": "^2.3.0" } }, @@ -6627,17 +6678,20 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -6730,13 +6784,14 @@ } }, "node_modules/safe-array-concat": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", - "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", "isarray": "^2.0.5" }, "engines": { @@ -6766,14 +6821,29 @@ } ] }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", - "is-regex": "^1.1.4" + "is-regex": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -6881,28 +6951,79 @@ } }, "node_modules/shiki": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.24.0.tgz", - "integrity": "sha512-qIneep7QRwxRd5oiHb8jaRzH15V/S8F3saCXOdjwRLgozZJr5x2yeBhQtqkO3FSzQDwYEFAYuifg4oHjpDghrg==", + "version": "1.24.4", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.24.4.tgz", + "integrity": "sha512-aVGSFAOAr1v26Hh/+GBIsRVDWJ583XYV7CuNURKRWh9gpGv4OdbisZGq96B9arMYTZhTQkmRF5BrShOSTvNqhw==", "dev": true, "dependencies": { - "@shikijs/core": "1.24.0", - "@shikijs/engine-javascript": "1.24.0", - "@shikijs/engine-oniguruma": "1.24.0", - "@shikijs/types": "1.24.0", - "@shikijs/vscode-textmate": "^9.3.0", + "@shikijs/core": "1.24.4", + "@shikijs/engine-javascript": "1.24.4", + "@shikijs/engine-oniguruma": "1.24.4", + "@shikijs/types": "1.24.4", + "@shikijs/vscode-textmate": "^9.3.1", "@types/hast": "^3.0.4" } }, "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "dependencies": { - "call-bind": "^1.0.7", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -6940,11 +7061,11 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", - "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", "dependencies": { - "agent-base": "^7.1.1", + "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" }, @@ -6953,12 +7074,9 @@ } }, "node_modules/socks-proxy-agent/node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", - "dependencies": { - "debug": "^4.3.4" - }, + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", "engines": { "node": ">= 14" } @@ -7156,23 +7274,24 @@ } }, "node_modules/string.prototype.matchall": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", - "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", + "es-abstract": "^1.23.6", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "regexp.prototype.flags": "^1.5.2", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", "set-function-name": "^2.0.2", - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -7209,14 +7328,17 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", - "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", - "es-object-atoms": "^1.0.0" + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -7226,14 +7348,18 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", - "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7570,28 +7696,28 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", - "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" + "is-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -7601,17 +7727,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz", - "integrity": "sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13", - "reflect.getprototypeof": "^1.0.6" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" }, "engines": { "node": ">= 0.4" @@ -7732,14 +7858,14 @@ } }, "node_modules/typescript-eslint": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.17.0.tgz", - "integrity": "sha512-409VXvFd/f1br1DCbuKNFqQpXICoTB+V51afcwG1pn1a3Cp92MqAUges3YjwEdQ0cMUoCIodjVDAYzyD8h3SYA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.19.0.tgz", + "integrity": "sha512-Ni8sUkVWYK4KAcTtPjQ/UTiRk6jcsuDhPpxULapUDi8A/l8TSBk+t1GtJA1RsCzIJg0q6+J7bf35AwQigENWRQ==", "dev": true, "dependencies": { - "@typescript-eslint/eslint-plugin": "8.17.0", - "@typescript-eslint/parser": "8.17.0", - "@typescript-eslint/utils": "8.17.0" + "@typescript-eslint/eslint-plugin": "8.19.0", + "@typescript-eslint/parser": "8.19.0", + "@typescript-eslint/utils": "8.19.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7749,12 +7875,8 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.8.0" } }, "node_modules/uc.micro": { @@ -7764,14 +7886,17 @@ "dev": true }, "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", "dependencies": { - "call-bind": "^1.0.2", + "call-bound": "^1.0.3", "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8013,15 +8138,15 @@ } }, "node_modules/which-boxed-primitive": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.0.tgz", - "integrity": "sha512-Ei7Miu/AXe2JJ4iNF5j/UphAgRoma4trE6PtisM09bPygb3egMH3YLW/befsWb1A1AxvNSFidOFTB18XtnIIng==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", "dependencies": { "is-bigint": "^1.1.0", - "is-boolean-object": "^1.2.0", - "is-number-object": "^1.1.0", - "is-string": "^1.1.0", - "is-symbol": "^1.1.0" + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" }, "engines": { "node": ">= 0.4" @@ -8031,23 +8156,23 @@ } }, "node_modules/which-builtin-type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.0.tgz", - "integrity": "sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.2", "function.prototype.name": "^1.1.6", "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", - "is-date-object": "^1.0.5", + "is-date-object": "^1.1.0", "is-finalizationregistry": "^1.1.0", "is-generator-function": "^1.0.10", - "is-regex": "^1.1.4", + "is-regex": "^1.2.1", "is-weakref": "^1.0.2", "isarray": "^2.0.5", - "which-boxed-primitive": "^1.0.2", + "which-boxed-primitive": "^1.1.0", "which-collection": "^1.0.2", - "which-typed-array": "^1.1.15" + "which-typed-array": "^1.1.16" }, "engines": { "node": ">= 0.4" @@ -8080,14 +8205,15 @@ "dev": true }, "node_modules/which-typed-array": { - "version": "1.1.16", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.16.tgz", - "integrity": "sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz", + "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==", "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "for-each": "^0.3.3", - "gopd": "^1.0.1", + "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" }, "engines": { diff --git a/package.json b/package.json index 8f7143bc5..5eb089650 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aerospike", - "version": "5.13.2-dev1", + "version": "6.0.1", "description": "Aerospike Client Library", "keywords": [ "aerospike", @@ -41,7 +41,8 @@ "preinstall": "npm install @mapbox/node-pre-gyp", "install": "npm run build", "build": "node-pre-gyp install --fallback-to-build", - "test": "rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha", + "test-prereq": "cd ts-test; npm install ..; run: npm i --save-dev @types/jest; run: npm i --save-dev @types/chai; cd ..;", + "test": "rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/${npm_config_testfile:-} ", "test-dry-run": "mocha --dry-run", "test-noserver": "GLOBAL_CLIENT=false mocha -g '#noserver'", "lint": "standard", @@ -93,8 +94,7 @@ "apidocs", "tmp-*.js", "/*.js", - "libuv-v*", - "ts-test/dist" + "libuv-v*" ] }, "files": [ @@ -102,15 +102,12 @@ "aerospike-client-c.sha256", "binding.gyp", "benchmarks/", - "CHANGELOG.md", "examples/", "lib/", - "LICENSE", "scripts/", "src/", "test/", "ts-test/", - "tsconfig.json", "typings/" ] } diff --git a/ts-test/package-lock.json b/ts-test/package-lock.json index 36073f526..672a72964 100644 --- a/ts-test/package-lock.json +++ b/ts-test/package-lock.json @@ -1,3 +1,4 @@ + { "name": "ts-test", "version": "1.0.0", @@ -12,7 +13,7 @@ "aerospike": "file:.." }, "devDependencies": { - "@types/chai": "^4.3.19", + "@types/chai": "^5.0.1", "@types/mocha": "^10.0.7", "@types/semver": "^7.5.8", "@types/tmp": "^0.2.6", @@ -25,7 +26,7 @@ }, "..": { "name": "aerospike", - "version": "5.13.2", + "version": "5.13.1", "cpu": [ "x64", "arm64" @@ -194,9 +195,18 @@ "license": "MIT" }, "node_modules/@types/chai": { - "version": "4.3.19", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.19.tgz", - "integrity": "sha512-2hHHvQBVE2FiSK4eN0Br6snX9MtolHaTo/batnLjlGRhoQzlCL61iVpxoqO7SfFyOw+P/pwv+0zNHzKoGWz9Cw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.0.1.tgz", + "integrity": "sha512-5T8ajsg3M/FOncpLYW7sdOcD6yf4+722sze/tc4KQV0P8Z2rAr3SAuHCIkYmYpt8VbcQlnz8SxlOlPQYefe4cA==", + "dev": true, + "dependencies": { + "@types/deep-eql": "*" + } + }, + "node_modules/@types/deep-eql": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", + "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==", "dev": true }, "node_modules/@types/hast": { From 95fe278229466f6f6fbbdb516f197468b59820cb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 06:34:42 -0700 Subject: [PATCH 054/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 5fc4064e7..0a61ee298 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -59,7 +59,7 @@ jobs: echo "current_version=$(node -p \"require('./package.json').version\")" >> $GITHUB_OUTPUT - name: Print current version - run: echo "Current version is: ${{ steps.get-current-version.outputs.current_version }}" + run: echo "Current version is= ${{ steps.get-current-version.outputs.current_version }}" From c14d5e30e86ade01079c0b9ac3839ead3e78cf9a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 06:38:18 -0700 Subject: [PATCH 055/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 0a61ee298..c88c43f5c 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -56,10 +56,10 @@ jobs: - name: Get current version id: get-current-version run: | - echo "current_version=$(node -p \"require('./package.json').version\")" >> $GITHUB_OUTPUT + echo "current_version=$(node -p 'require(\"./package.json\").version')" >> $GITHUB_OUTPUT - name: Print current version - run: echo "Current version is= ${{ steps.get-current-version.outputs.current_version }}" + run: echo "Current version is ${{ steps.get-current-version.outputs.current_version }}" From 5667b4fd27e13c29a4c8921a66291b1a7a5d1e12 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 06:43:10 -0700 Subject: [PATCH 056/417] CI/CD Improvements --- .github/workflows/dev-workflow-p1.yml | 11 +++++----- .github/workflows/dev-workflow-p2.yml | 31 ++++++++++++++------------- ts-test/tests/batch_write.ts | 3 --- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 77a0f5181..8e90900c7 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -34,8 +34,9 @@ jobs: sha-to-build-and-test: ${{ github.sha }} secrets: inherit - test-with-server-rc: - needs: test-with-server-release - if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'new-server-features') }} - uses: ./.github/workflows/test-server-rc.yml - secrets: inherit +# test-with-server-rc: +# needs: test-with-server-release +# if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'new-server-features') }} +# uses: ./.github/workflows/test-server-rc.yml +# secrets: inherit +# \ No newline at end of file diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 76daed810..667e33369 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,18 +25,19 @@ jobs: sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} secrets: inherit - upload-to-jfrog: - name: Upload artifacts to JFrog - needs: [ - bump-dev-number, - rebuild-artifacts-with-new-dev-num - ] - uses: ./.github/workflows/upload-to-jfrog.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit - - # We don't want the artifacts in JFrog to also exist in Github - delete-artifacts: - needs: upload-to-jfrog - uses: ./.github/workflows/delete-artifacts.yml +# upload-to-jfrog: +# name: Upload artifacts to JFrog +# needs: [ +# bump-dev-number, +# rebuild-artifacts-with-new-dev-num +# ] +# uses: ./.github/workflows/upload-to-jfrog.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit +# +# # We don't want the artifacts in JFrog to also exist in Github +# delete-artifacts: +# needs: upload-to-jfrog +# uses: ./.github/workflows/delete-artifacts.yml +# \ No newline at end of file diff --git a/ts-test/tests/batch_write.ts b/ts-test/tests/batch_write.ts index 059868457..e0864637e 100644 --- a/ts-test/tests/batch_write.ts +++ b/ts-test/tests/batch_write.ts @@ -535,9 +535,6 @@ describe('client.batchWrite()', function () { policies: { batchParentWrite: new Aerospike.BatchPolicy({ socketTimeout: 0, totalTimeout: 0, deserialize: false }) }, - user: helper.config.user, - password: helper.config.password - } const dummyClient = await Aerospike.connect(config) From b0e208e0b31df23d91ff53a3bfa122cf555d105b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 07:50:43 -0700 Subject: [PATCH 057/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 5 ++ .github/workflows/npm-install-script-test.yml | 83 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 .github/workflows/npm-install-script-test.yml diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 667e33369..d2b537625 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,6 +25,11 @@ jobs: sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} secrets: inherit + test-npm-install: + needs: rebuild-artifacts-with-new-dev-num + name: Test npm install command for npm package + uses: ./.github/workflows/npm-install-script-test.yml + # upload-to-jfrog: # name: Upload artifacts to JFrog # needs: [ diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml new file mode 100644 index 000000000..d099008fc --- /dev/null +++ b/.github/workflows/npm-install-script-test.yml @@ -0,0 +1,83 @@ +name: npm install script test + +on: + workflow_call: # This allows this workflow to be reused by others. + inputs: + build_identifier: + required: true + type: string + +jobs: + npm-install-script-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + + - name: Create multiple directories + run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31 + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v108-manylinux_x86_64 + path: ./lib/binding/glibc@2.35/ + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v108-macosx_x86_64 + path: ./lib/binding + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v115-manylinux_x86_64 + path: ./lib/binding/glibc@2.35/ + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v115-macosx_x86_64 + path: ./lib/binding + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v127-manylinux_x86_64 + path: ./lib/binding/glibc@2.35/ + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v127-macosx_x86_64 + path: ./lib/binding + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v131-manylinux_x86_64 + path: ./lib/binding/glibc@2.35/ + + - name: Download wheels from GitHub + uses: actions/download-artifact@v4 + with: + name: v131-macosx_x86_64 + path: ./lib/binding + + + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: 20 + + - name: Run Node.js script + run: node ./scripts/prebuiltBinding.js + + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" \ No newline at end of file From 9a8a8525e9a9498671af54f5b65f0f420197e6e8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 07:52:35 -0700 Subject: [PATCH 058/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index d099008fc..34a7191c6 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -2,10 +2,6 @@ name: npm install script test on: workflow_call: # This allows this workflow to be reused by others. - inputs: - build_identifier: - required: true - type: string jobs: npm-install-script-test: From 5b13f63937390c45dddf416f107ba63cdbe6c8aa Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 08:04:43 -0700 Subject: [PATCH 059/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 34a7191c6..af27cd5b9 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -18,49 +18,49 @@ jobs: - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v108-manylinux_x86_64 + name: v108-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v108-macosx_x86_64 + name: v108-macosx_x86_64.node path: ./lib/binding - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v115-manylinux_x86_64 + name: v115-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v115-macosx_x86_64 + name: v115-macosx_x86_64.node path: ./lib/binding - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v127-manylinux_x86_64 + name: v127-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v127-macosx_x86_64 + name: v127-macosx_x86_64.node path: ./lib/binding - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v131-manylinux_x86_64 + name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v131-macosx_x86_64 + name: v131-macosx_x86_64.node path: ./lib/binding From bf34ea3fa76f882bedc7422a869d67527b351a03 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 08:23:38 -0700 Subject: [PATCH 060/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index af27cd5b9..bf90a5023 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -15,48 +15,72 @@ jobs: - name: Create multiple directories run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31 + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: name: v108-macosx_x86_64.node path: ./lib/binding + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: name: v115-macosx_x86_64.node path: ./lib/binding + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: name: v127-macosx_x86_64.node path: ./lib/binding + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: From 36a9c5f49b6de5d8868d68b105985ba672359a2c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 09:45:12 -0700 Subject: [PATCH 061/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 47 ++++++------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index bf90a5023..bed7419c5 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -15,78 +15,59 @@ jobs: - name: Create multiple directories run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31 - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/ - - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" + name: v108-macosx_x86_64.node + path: ./lib/binding - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v108-macosx_x86_64.node + name: v115-macosx_x86_64.node path: ./lib/binding - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" - - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/ - - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" + name: v127-macosx_x86_64.node + path: ./lib/binding - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v115-macosx_x86_64.node + name: v131-macosx_x86_64.node path: ./lib/binding + - name: List available artifacts run: ls ./lib/binding || echo "No artifacts found in binding" + - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v127-manylinux_x86_64.node + name: v108-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" - - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v127-macosx_x86_64.node - path: ./lib/binding - - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" + name: v115-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/ - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v131-manylinux_x86_64.node + name: v127-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" - - name: Download wheels from GitHub uses: actions/download-artifact@v4 with: - name: v131-macosx_x86_64.node - path: ./lib/binding - + name: v131-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/ - name: List available artifacts run: ls ./lib/binding || echo "No artifacts found in binding" From 968a8a9035871f8d38c19bd8f3e1544bbcac6758 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 09:49:16 -0700 Subject: [PATCH 062/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index bed7419c5..952ddc723 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -69,6 +69,9 @@ jobs: name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/ + - name: Sleep to wait for downloads + run: sleep 30 + - name: List available artifacts run: ls ./lib/binding || echo "No artifacts found in binding" From 3adb6ed0937220620c0cf5fd3d17811f25777852 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 09:56:44 -0700 Subject: [PATCH 063/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 93 ++++++++++++------- 1 file changed, 62 insertions(+), 31 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 952ddc723..a7ca17d72 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -16,61 +16,92 @@ jobs: run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31 - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + + # - uses: actions/download-artifact@v4 + # with: + # name: v108-macosx_aarch64.build + + - uses: actions/download-artifact@v4 with: name: v108-macosx_x86_64.node - path: ./lib/binding - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + # - uses: actions/download-artifact@v4 + # with: + # name: v115-macosx_aarch64.build + + - uses: actions/download-artifact@v4 with: name: v115-macosx_x86_64.node - path: ./lib/binding - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + # - uses: actions/download-artifact@v4 + # with: + # name: v127-macosx_aarch64.build + + - uses: actions/download-artifact@v4 with: name: v127-macosx_x86_64.node - path: ./lib/binding - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v4 with: name: v131-macosx_x86_64.node - path: ./lib/binding - - - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" - - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/ - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + # - uses: actions/download-artifact@v4 + # with: + # name: v108-manylinux_aarch64.build + + - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/ - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + # - uses: actions/download-artifact@v4 + # with: + # name: v115-manylinux_aarch64.build + + - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/ - - name: Download wheels from GitHub - uses: actions/download-artifact@v4 + # - uses: actions/download-artifact@v4 + # with: + # name: v127-manylinux_aarch64.build + + - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/ - - name: Sleep to wait for downloads - run: sleep 30 + # - uses: actions/download-artifact@v4 + # with: + # name: v131-manylinux_aarch64.build + + - name: Install client + shell: bash + run: | + mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 + mkdir -p lib/binding/glibc@2.39/node-v108-linux-arm64 lib/binding/glibc@2.39/node-v115-linux-arm64 lib/binding/glibc@2.39/node-v127-linux-arm64 lib/binding/glibc@2.39/node-v131-linux-arm64 + mkdir -p lib/binding/glibc@2.35/node-v108-linux-arm64 lib/binding/glibc@2.35/node-v115-linux-arm64 lib/binding/glibc@2.35/node-v127-linux-arm64 lib/binding/glibc@2.31/node-v131-linux-arm64 + mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 + mkdir -p lib/binding/glibc@2.39/node-v108-linux-x64 lib/binding/glibc@2.39/node-v115-linux-x64 lib/binding/glibc@2.39/node-v127-linux-x64 lib/binding/glibc@2.39/node-v131-linux-x64 + mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64 + mkdir -p lib/binding/glibc@2.31/node-v108-linux-x64 lib/binding/glibc@2.31/node-v115-linux-x64 lib/binding/glibc@2.31/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 + cp -r node-v108-linux-x64 lib/binding/glibc@2.35/ + cp -r node-v115-linux-x64 lib/binding/glibc@2.35/ + cp -r node-v127-linux-x64 lib/binding/glibc@2.35/ + cp -r node-v108-darwin-x64 lib/binding/node-v108-darwin-x64 + cp -r node-v115-darwin-x64 lib/binding/node-v115-darwin-x64 + cp -r node-v127-darwin-x64 lib/binding/node-v127-darwin-x64 + cp -r node-v127-darwin-x64 lib/binding/node-v131-darwin-x64 + # cp -r node-v108-linux-arm64 lib/binding/node-v108-linux-arm64 + # cp -r node-v115-linux-arm64 lib/binding/node-v115-linux-arm64 + # cp -r node-v127-linux-arm64 lib/binding/node-v127-linux-arm64 + # cp -r node-v127-linux-arm64 lib/binding/node-v131-linux-arm64 + # cp -r node-v108-darwin-arm64 lib/binding/node-v108-darwin-arm64 + # cp -r node-v115-darwin-arm64 lib/binding/node-v115-darwin-arm64 + # cp -r node-v127-darwin-arm64 lib/binding/node-v127-darwin-arm64 + # cp -r node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 - name: List available artifacts run: ls ./lib/binding || echo "No artifacts found in binding" From 925f2913eb8e04e6e0ae823f01933b378301001b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 3 Jan 2025 10:16:17 -0700 Subject: [PATCH 064/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index a7ca17d72..823f39fe1 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -80,6 +80,8 @@ jobs: - name: Install client shell: bash run: | + ls .; + ls ./lib/binding; mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 mkdir -p lib/binding/glibc@2.39/node-v108-linux-arm64 lib/binding/glibc@2.39/node-v115-linux-arm64 lib/binding/glibc@2.39/node-v127-linux-arm64 lib/binding/glibc@2.39/node-v131-linux-arm64 mkdir -p lib/binding/glibc@2.35/node-v108-linux-arm64 lib/binding/glibc@2.35/node-v115-linux-arm64 lib/binding/glibc@2.35/node-v127-linux-arm64 lib/binding/glibc@2.31/node-v131-linux-arm64 From 63fddc8694425a94b941427d2a635c66e1d7b02b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 6 Jan 2025 23:26:36 -0700 Subject: [PATCH 065/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 328215c1f..99d762cf3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -190,7 +190,7 @@ jobs: if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} uses: ./.github/actions/setup-docker-on-macos - - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' + - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} uses: ./.github/actions/run-ee-server-for-ext-container with: @@ -263,7 +263,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.3 --port 3000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel From 9b9265e465b92371b3781fe268903c79aaf00fdf Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 6 Jan 2025 23:29:22 -0700 Subject: [PATCH 066/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 99d762cf3..90e962bf8 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -190,7 +190,7 @@ jobs: if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} uses: ./.github/actions/setup-docker-on-macos - - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' + - name: 'macOS x86: run Aerospike server in Docker container and connect via localhost' if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'macosx_x86_64' }} uses: ./.github/actions/run-ee-server-for-ext-container with: From 9c02c00ce1ea81d24886349cfddb81789e3f346b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 6 Jan 2025 23:47:23 -0700 Subject: [PATCH 067/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- .github/workflows/npm-install-script-test.yml | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 90e962bf8..328215c1f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -263,7 +263,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.3 --port 3000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 823f39fe1..f3761e1ca 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -24,6 +24,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v108-macosx_x86_64.node + path: ./lib/binding # - uses: actions/download-artifact@v4 # with: @@ -32,6 +33,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v115-macosx_x86_64.node + path: ./lib/binding # - uses: actions/download-artifact@v4 # with: @@ -40,14 +42,17 @@ jobs: - uses: actions/download-artifact@v4 with: name: v127-macosx_x86_64.node + path: ./lib/binding - uses: actions/download-artifact@v4 with: name: v131-macosx_x86_64.node + path: ./lib/binding - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node + path: ./lib/binding # - uses: actions/download-artifact@v4 # with: @@ -56,6 +61,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node + path: ./lib/binding # - uses: actions/download-artifact@v4 # with: @@ -64,6 +70,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node + path: ./lib/binding # - uses: actions/download-artifact@v4 # with: @@ -72,6 +79,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node + path: ./lib/binding # - uses: actions/download-artifact@v4 # with: @@ -83,10 +91,8 @@ jobs: ls .; ls ./lib/binding; mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 - mkdir -p lib/binding/glibc@2.39/node-v108-linux-arm64 lib/binding/glibc@2.39/node-v115-linux-arm64 lib/binding/glibc@2.39/node-v127-linux-arm64 lib/binding/glibc@2.39/node-v131-linux-arm64 mkdir -p lib/binding/glibc@2.35/node-v108-linux-arm64 lib/binding/glibc@2.35/node-v115-linux-arm64 lib/binding/glibc@2.35/node-v127-linux-arm64 lib/binding/glibc@2.31/node-v131-linux-arm64 mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 - mkdir -p lib/binding/glibc@2.39/node-v108-linux-x64 lib/binding/glibc@2.39/node-v115-linux-x64 lib/binding/glibc@2.39/node-v127-linux-x64 lib/binding/glibc@2.39/node-v131-linux-x64 mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64 mkdir -p lib/binding/glibc@2.31/node-v108-linux-x64 lib/binding/glibc@2.31/node-v115-linux-x64 lib/binding/glibc@2.31/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 cp -r node-v108-linux-x64 lib/binding/glibc@2.35/ @@ -95,7 +101,7 @@ jobs: cp -r node-v108-darwin-x64 lib/binding/node-v108-darwin-x64 cp -r node-v115-darwin-x64 lib/binding/node-v115-darwin-x64 cp -r node-v127-darwin-x64 lib/binding/node-v127-darwin-x64 - cp -r node-v127-darwin-x64 lib/binding/node-v131-darwin-x64 + cp -r node-v131-darwin-x64 lib/binding/node-v131-darwin-x64 # cp -r node-v108-linux-arm64 lib/binding/node-v108-linux-arm64 # cp -r node-v115-linux-arm64 lib/binding/node-v115-linux-arm64 # cp -r node-v127-linux-arm64 lib/binding/node-v127-linux-arm64 From 77dd2348dbf38e4150ce7d722ba6fed7d4d89e65 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 00:06:00 -0700 Subject: [PATCH 068/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 328215c1f..644165a4f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -263,7 +263,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel @@ -286,7 +286,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: - path: ./lib/binding/* + path: ./lib/binding/*/ name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status From bd43e480fc974e96cdaae77053c3f01b6fcd3992 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 00:25:50 -0700 Subject: [PATCH 069/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 13 ++++++++++--- .github/workflows/npm-install-script-test.yml | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 644165a4f..3cc69f305 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -282,11 +282,18 @@ jobs: # CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path ./aerospike-client-c/vs/x64/Release -w {dest_dir} {wheel}" # CIBW_TEST_COMMAND: ${{ env.TEST_COMMAND }} # - - name: Upload wheels to GitHub + - name: Upload wheels to GitHub Mac uses: actions/upload-artifact@v4 - if: ${{ !cancelled() }} + if: ${{ inputs.platform-tag == 'manylinux_x86_64' }} with: - path: ./lib/binding/*/ + path: ./lib/binding/node-${{ fromJSON(inputs.nodejs-tags) }}-linux-x64/aerospike.node + name: ${{ env.BUILD_IDENTIFIER }}.node + + - name: Upload wheels to GitHub Linux + uses: actions/upload-artifact@v4 + if: ${{ inputs.platform-tag == 'macosx_x86_64' }} + with: + path: ./lib/binding/node-${{ fromJSON(inputs.nodejs-tags) }}-darwin-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index f3761e1ca..a203b5194 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v108-macosx_x86_64.node - path: ./lib/binding + path: ./lib/binding/ # - uses: actions/download-artifact@v4 # with: @@ -33,7 +33,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v115-macosx_x86_64.node - path: ./lib/binding + path: ./lib/binding/ # - uses: actions/download-artifact@v4 # with: @@ -42,17 +42,17 @@ jobs: - uses: actions/download-artifact@v4 with: name: v127-macosx_x86_64.node - path: ./lib/binding + path: ./lib/binding/ - uses: actions/download-artifact@v4 with: name: v131-macosx_x86_64.node - path: ./lib/binding + path: ./lib/binding/ - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node - path: ./lib/binding + path: ./lib/binding/ # - uses: actions/download-artifact@v4 # with: @@ -61,7 +61,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node - path: ./lib/binding + path: ./lib/binding/ # - uses: actions/download-artifact@v4 # with: @@ -70,7 +70,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node - path: ./lib/binding + path: ./lib/binding/ # - uses: actions/download-artifact@v4 # with: @@ -79,7 +79,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node - path: ./lib/binding + path: ./lib/binding/ # - uses: actions/download-artifact@v4 # with: @@ -89,7 +89,9 @@ jobs: shell: bash run: | ls .; + echo "BINDING FOLDER:"; ls ./lib/binding; + echo "BINDING FOLDER:"; mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 mkdir -p lib/binding/glibc@2.35/node-v108-linux-arm64 lib/binding/glibc@2.35/node-v115-linux-arm64 lib/binding/glibc@2.35/node-v127-linux-arm64 lib/binding/glibc@2.31/node-v131-linux-arm64 mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 From e31142248738916b3f12098b5413e3fa06ddde6c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 00:35:08 -0700 Subject: [PATCH 070/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3cc69f305..df945ecfe 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -286,14 +286,14 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'manylinux_x86_64' }} with: - path: ./lib/binding/node-${{ fromJSON(inputs.nodejs-tags) }}-linux-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag }}-linux-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Upload wheels to GitHub Linux uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'macosx_x86_64' }} with: - path: ./lib/binding/node-${{ fromJSON(inputs.nodejs-tags) }}-darwin-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag }}-darwin-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status From db52ee60cfe14d4a79c153e2b725612f4338e6bf Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 00:43:25 -0700 Subject: [PATCH 071/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index df945ecfe..2f2ecaf9b 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -282,14 +282,20 @@ jobs: # CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path ./aerospike-client-c/vs/x64/Release -w {dest_dir} {wheel}" # CIBW_TEST_COMMAND: ${{ env.TEST_COMMAND }} # - - name: Upload wheels to GitHub Mac + + - name: Run tests + if: ${{ inputs.run_tests && inputs.platform-tag == 'macosx_x86_64'}} + run: | + ls ./lib/binding; + + - name: Upload wheels to GitHub Linux uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'manylinux_x86_64' }} with: path: ./lib/binding/node-${{ matrix.nodejs-tag }}-linux-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - - name: Upload wheels to GitHub Linux + - name: Upload wheels to GitHub Mac uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'macosx_x86_64' }} with: From ef30689440804a33ce45f7277b5916833ea7062e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 00:50:44 -0700 Subject: [PATCH 072/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2f2ecaf9b..c68645fe6 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -284,7 +284,6 @@ jobs: # - name: Run tests - if: ${{ inputs.run_tests && inputs.platform-tag == 'macosx_x86_64'}} run: | ls ./lib/binding; From b07aaeacd1dd193fd9e12943cd3a773f8c6feea1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:03:33 -0700 Subject: [PATCH 073/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index c68645fe6..0f75c1eaf 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -80,7 +80,7 @@ on: nodejs-tags: type: string required: false - default: '["v108", "v115", "v127", "v131"]' + default: '[["v108", 18], ["v115, 20"], ["v127", 22], ["v131", 23]' platform-tag: type: string required: true @@ -160,7 +160,7 @@ jobs: fail-fast: false runs-on: ${{ needs.get-runner-os.outputs.runner-os }} env: - BUILD_IDENTIFIER: "${{ matrix.nodejs-tag }}-${{ inputs.platform-tag }}" + BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}" MACOS_OPENSSL_VERSION: 3 steps: - name: Create status check message @@ -181,6 +181,10 @@ jobs: # We need the last tag before the ref, so we can relabel the version if needed fetch-depth: 0 + - uses: actions/setup-node@v5 + with: + nodejs-version: ${{ matrix.nodejs-tags[1] }} + - name: 'Windows: Install C client deps' if: ${{ inputs.platform-tag == 'win_amd64' }} run: nuget restore @@ -291,14 +295,14 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'manylinux_x86_64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag }}-linux-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Upload wheels to GitHub Mac uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'macosx_x86_64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag }}-darwin-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status @@ -319,7 +323,7 @@ jobs: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} runs-on: ${{ inputs.platform-tag == 'macosx_arm64' && fromJSON('["self-hosted", "macOS", "ARM64"]') || fromJSON('["self-hosted", "Windows", "X64"]') }} env: - BUILD_IDENTIFIER: "${{ matrix.nodejs-tag }}-${{ inputs.platform-tag }}" + BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}" steps: - name: Create status check message run: echo STATUS_CHECK_MESSAGE="Test on self hosted (${{ env.BUILD_IDENTIFIER }})" >> $GITHUB_ENV @@ -356,7 +360,7 @@ jobs: # Don't use sed because we want this command to work on both mac and windows # The command used in GNU sed is different than in macOS sed run: | - NODEJS_TAG=${{ matrix.nodejs-tag }} + NODEJS_TAG=${{ matrix.nodejs-tag[0] }} NODEJS_VERSION="${NODEJS_TAG/cp/}" echo NODEJS_VERSION="${NODEJS_VERSION/3/3.}" >> $GITHUB_ENV shell: bash From eb6175abccf275566fb8254c8cd64b66f7270559 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:07:38 -0700 Subject: [PATCH 074/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 0f75c1eaf..6b9a99c34 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -80,7 +80,7 @@ on: nodejs-tags: type: string required: false - default: '[["v108", 18], ["v115, 20"], ["v127", 22], ["v131", 23]' + default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]' platform-tag: type: string required: true From 8a07e9438c14e9784f8cfbdecd0ad1f2ba4033ca Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:10:37 -0700 Subject: [PATCH 075/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 6b9a99c34..a63362937 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -27,7 +27,7 @@ on: type: string description: Valid JSON list of Python tags to build the client for required: false - default: '["v108", "v115", "v127", "v131"]' + default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]' platform-tag: description: Platform to build the client for. type: choice From 3a2e32af7f2f3a684179c2a6b8f36a8c4b13e53a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:13:12 -0700 Subject: [PATCH 076/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a63362937..4e2068213 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -27,7 +27,7 @@ on: type: string description: Valid JSON list of Python tags to build the client for required: false - default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]' + default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]]' platform-tag: description: Platform to build the client for. type: choice @@ -80,7 +80,7 @@ on: nodejs-tags: type: string required: false - default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]' + default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]]' platform-tag: type: string required: true From 491c5050ebec8ce2c1272059725e9a069ebdcabb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:15:02 -0700 Subject: [PATCH 077/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 4e2068213..a030ad04e 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -181,7 +181,7 @@ jobs: # We need the last tag before the ref, so we can relabel the version if needed fetch-depth: 0 - - uses: actions/setup-node@v5 + - uses: actions/setup-node@v4 with: nodejs-version: ${{ matrix.nodejs-tags[1] }} @@ -365,7 +365,7 @@ jobs: echo NODEJS_VERSION="${NODEJS_VERSION/3/3.}" >> $GITHUB_ENV shell: bash - - uses: actions/setup-node@v5 + - uses: actions/setup-node@v4 with: nodejs-version: ${{ env.NODEJS_VERSION }} From 7d9405e3e9481233e38262c60a85cdacd2bc74af Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:22:33 -0700 Subject: [PATCH 078/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a030ad04e..52f66769f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -183,7 +183,7 @@ jobs: - uses: actions/setup-node@v4 with: - nodejs-version: ${{ matrix.nodejs-tags[1] }} + node-version: ${{ matrix.nodejs-tags[1] }} - name: 'Windows: Install C client deps' if: ${{ inputs.platform-tag == 'win_amd64' }} @@ -367,7 +367,7 @@ jobs: - uses: actions/setup-node@v4 with: - nodejs-version: ${{ env.NODEJS_VERSION }} + node-version: ${{ env.NODEJS_VERSION }} - name: Install wheel run: | From 077973a97d1af6f1dc881c8f5a231a5d1f21e9f8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:37:18 -0700 Subject: [PATCH 079/417] CI/CD Improvements --- ts-test/tests/test_helper.ts | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/ts-test/tests/test_helper.ts b/ts-test/tests/test_helper.ts index f23657f43..e54cc8a9f 100644 --- a/ts-test/tests/test_helper.ts +++ b/ts-test/tests/test_helper.ts @@ -90,15 +90,21 @@ Aerospike.setDefaultLogging(config.log ?? {}) datatype: dataType, context }; - return this.client.createIndex(index) - .then((job: IndexJob) => job.wait(10)) - .catch((error: any) => { - if (error.code === Aerospike.status.ERR_INDEX_FOUND) { - // ignore - index already exists - } else { - return Promise.reject(error); + const retries = 3; + for (let attempt = 0; attempt < retries; attempt++) { + try { + const job: any = await this.client.createIndex(index); + await job.wait(10); + return; + } catch (error) { + if (error.code === Aerospike.status.ERR_INDEX_FOUND) { + return; + } + if (attempt === retries - 1) { + return Promise.reject(error); + } } - }); + }; } remove(indexName: string) { From dc222b8bb20cdc2f4994c24429ceeb733fce22c2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:44:23 -0700 Subject: [PATCH 080/417] CI/CD Improvements --- ts-test/tests/test_helper.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ts-test/tests/test_helper.ts b/ts-test/tests/test_helper.ts index e54cc8a9f..52f22bc29 100644 --- a/ts-test/tests/test_helper.ts +++ b/ts-test/tests/test_helper.ts @@ -93,10 +93,9 @@ Aerospike.setDefaultLogging(config.log ?? {}) const retries = 3; for (let attempt = 0; attempt < retries; attempt++) { try { - const job: any = await this.client.createIndex(index); - await job.wait(10); - return; - } catch (error) { + const job: any = this.client.createIndex(index); + return job.IndexJob(10); + } catch (error: any) { if (error.code === Aerospike.status.ERR_INDEX_FOUND) { return; } @@ -105,6 +104,15 @@ Aerospike.setDefaultLogging(config.log ?? {}) } } }; + return this.client.createIndex(index) + .then((job: IndexJob) => job.wait(10)) + .catch((error: any) => { + if (error.code === Aerospike.status.ERR_INDEX_FOUND) { + // ignore - index already exists + } else { + return Promise.reject(error); + } + }); } remove(indexName: string) { From afb14f4abee81d41cef2847b287053729f09cfc4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:51:28 -0700 Subject: [PATCH 081/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 52f66769f..1bc57a74c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -27,7 +27,7 @@ on: type: string description: Valid JSON list of Python tags to build the client for required: false - default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]]' + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' platform-tag: description: Platform to build the client for. type: choice @@ -80,7 +80,7 @@ on: nodejs-tags: type: string required: false - default: '[["v108", 18], ["v115", 20], ["v127", 22], ["v131", 23]]' + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' platform-tag: type: string required: true From f09cf350759d7a88b156ce56cb3f645c0a656be7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 01:56:32 -0700 Subject: [PATCH 082/417] CI/CD Improvements --- ts-test/tests/test_helper.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ts-test/tests/test_helper.ts b/ts-test/tests/test_helper.ts index 52f22bc29..c72f29f5e 100644 --- a/ts-test/tests/test_helper.ts +++ b/ts-test/tests/test_helper.ts @@ -104,15 +104,6 @@ Aerospike.setDefaultLogging(config.log ?? {}) } } }; - return this.client.createIndex(index) - .then((job: IndexJob) => job.wait(10)) - .catch((error: any) => { - if (error.code === Aerospike.status.ERR_INDEX_FOUND) { - // ignore - index already exists - } else { - return Promise.reject(error); - } - }); } remove(indexName: string) { From cd4173eac21c91e5ab1f19e1bb90f6c2aba745ec Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:03:37 -0700 Subject: [PATCH 083/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 1bc57a74c..cd6f183bc 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -183,7 +183,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: ${{ matrix.nodejs-tags[1] }} + node-version: ${{ matrix.nodejs-tag[1] }} - name: 'Windows: Install C client deps' if: ${{ inputs.platform-tag == 'win_amd64' }} From b77e03de4941d2f7d37b09b71deb3efc6e2a32e2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:13:15 -0700 Subject: [PATCH 084/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index a203b5194..e617461f3 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -13,7 +13,7 @@ jobs: - name: Create multiple directories - run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31 + run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ @@ -24,7 +24,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v108-macosx_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/node-v108-darwin-arm64/ # - uses: actions/download-artifact@v4 # with: @@ -33,7 +33,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v115-macosx_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/node-v115-darwin-arm64/ # - uses: actions/download-artifact@v4 # with: @@ -42,17 +42,17 @@ jobs: - uses: actions/download-artifact@v4 with: name: v127-macosx_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/node-v127-darwin-arm64/ - uses: actions/download-artifact@v4 with: name: v131-macosx_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/node-v131-darwin-arm64/ - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/glibc@2.31/node-v108-linux-arm64/ # - uses: actions/download-artifact@v4 # with: @@ -61,7 +61,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/glibc@2.31/node-v115-linux-arm64/ # - uses: actions/download-artifact@v4 # with: @@ -70,7 +70,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/glibc@2.31/node-v127-linux-arm64/ # - uses: actions/download-artifact@v4 # with: @@ -79,7 +79,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node - path: ./lib/binding/ + path: ./lib/binding/glibc@2.31/node-v131-linux-arm64/ # - uses: actions/download-artifact@v4 # with: @@ -91,19 +91,19 @@ jobs: ls .; echo "BINDING FOLDER:"; ls ./lib/binding; - echo "BINDING FOLDER:"; - mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 - mkdir -p lib/binding/glibc@2.35/node-v108-linux-arm64 lib/binding/glibc@2.35/node-v115-linux-arm64 lib/binding/glibc@2.35/node-v127-linux-arm64 lib/binding/glibc@2.31/node-v131-linux-arm64 - mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 - mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64 - mkdir -p lib/binding/glibc@2.31/node-v108-linux-x64 lib/binding/glibc@2.31/node-v115-linux-x64 lib/binding/glibc@2.31/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 - cp -r node-v108-linux-x64 lib/binding/glibc@2.35/ - cp -r node-v115-linux-x64 lib/binding/glibc@2.35/ - cp -r node-v127-linux-x64 lib/binding/glibc@2.35/ - cp -r node-v108-darwin-x64 lib/binding/node-v108-darwin-x64 - cp -r node-v115-darwin-x64 lib/binding/node-v115-darwin-x64 - cp -r node-v127-darwin-x64 lib/binding/node-v127-darwin-x64 - cp -r node-v131-darwin-x64 lib/binding/node-v131-darwin-x64 + # echo "BINDING FOLDER:"; + # mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 + # mkdir -p lib/binding/glibc@2.35/node-v108-linux-arm64 lib/binding/glibc@2.35/node-v115-linux-arm64 lib/binding/glibc@2.35/node-v127-linux-arm64 lib/binding/glibc@2.31/node-v131-linux-arm64 + # mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 + # mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64 + # mkdir -p lib/binding/glibc@2.31/node-v108-linux-x64 lib/binding/glibc@2.31/node-v115-linux-x64 lib/binding/glibc@2.31/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 + # cp -r node-v108-linux-x64 lib/binding/glibc@2.35/ + # cp -r node-v115-linux-x64 lib/binding/glibc@2.35/ + # cp -r node-v127-linux-x64 lib/binding/glibc@2.35/ + # cp -r node-v108-darwin-x64 lib/binding/node-v108-darwin-x64 + # cp -r node-v115-darwin-x64 lib/binding/node-v115-darwin-x64 + # cp -r node-v127-darwin-x64 lib/binding/node-v127-darwin-x64 + # cp -r node-v131-darwin-x64 lib/binding/node-v131-darwin-x64 # cp -r node-v108-linux-arm64 lib/binding/node-v108-linux-arm64 # cp -r node-v115-linux-arm64 lib/binding/node-v115-linux-arm64 # cp -r node-v127-linux-arm64 lib/binding/node-v127-linux-arm64 From 0823275d00f6aecf124e60bd719f3450de862fdd Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:21:18 -0700 Subject: [PATCH 085/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index e617461f3..c4be7ff4f 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -93,7 +93,9 @@ jobs: ls ./lib/binding; # echo "BINDING FOLDER:"; # mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 - # mkdir -p lib/binding/glibc@2.35/node-v108-linux-arm64 lib/binding/glibc@2.35/node-v115-linux-arm64 lib/binding/glibc@2.35/node-v127-linux-arm64 lib/binding/glibc@2.31/node-v131-linux-arm64 + mkdir -p lib/binding/glibc@2.35/node-v108-darwin-x64 lib/binding/glibc@2.35/node-v115-darwin-x64 lib/binding/glibc@2.35/node-v127-darwin-x64 lib/binding/glibc@2.31/node-v131-darwin-x64 + + mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 # mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 # mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64 # mkdir -p lib/binding/glibc@2.31/node-v108-linux-x64 lib/binding/glibc@2.31/node-v115-linux-x64 lib/binding/glibc@2.31/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 From 64397b24f6573b019b8f5976c7251ccb039c30fa Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:25:42 -0700 Subject: [PATCH 086/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index c4be7ff4f..b857a489e 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -91,11 +91,10 @@ jobs: ls .; echo "BINDING FOLDER:"; ls ./lib/binding; + mkdir -p lib/binding/glibc@2.35/node-v108-darwin-x64 lib/binding/glibc@2.35/node-v115-darwin-x64 lib/binding/glibc@2.35/node-v127-darwin-x64 lib/binding/glibc@2.35/node-v131-darwin-x64; + mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64; # echo "BINDING FOLDER:"; # mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 - mkdir -p lib/binding/glibc@2.35/node-v108-darwin-x64 lib/binding/glibc@2.35/node-v115-darwin-x64 lib/binding/glibc@2.35/node-v127-darwin-x64 lib/binding/glibc@2.31/node-v131-darwin-x64 - - mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 # mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 # mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64 # mkdir -p lib/binding/glibc@2.31/node-v108-linux-x64 lib/binding/glibc@2.31/node-v115-linux-x64 lib/binding/glibc@2.31/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64 From dfbfa0e4a7a1f86cd4217f84a283f7939439d990 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:27:17 -0700 Subject: [PATCH 087/417] CI/CD Improvements --- ts-test/tests/test_helper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-test/tests/test_helper.ts b/ts-test/tests/test_helper.ts index c72f29f5e..ebd1a8c14 100644 --- a/ts-test/tests/test_helper.ts +++ b/ts-test/tests/test_helper.ts @@ -94,7 +94,7 @@ Aerospike.setDefaultLogging(config.log ?? {}) for (let attempt = 0; attempt < retries; attempt++) { try { const job: any = this.client.createIndex(index); - return job.IndexJob(10); + return job.wait(10); } catch (error: any) { if (error.code === Aerospike.status.ERR_INDEX_FOUND) { return; From 4befc2d074439001b6ee638183ee2616476a10d0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:36:46 -0700 Subject: [PATCH 088/417] CI/CD Improvements --- ts-test/tests/test_helper.ts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ts-test/tests/test_helper.ts b/ts-test/tests/test_helper.ts index ebd1a8c14..292fd48a3 100644 --- a/ts-test/tests/test_helper.ts +++ b/ts-test/tests/test_helper.ts @@ -92,18 +92,20 @@ Aerospike.setDefaultLogging(config.log ?? {}) }; const retries = 3; for (let attempt = 0; attempt < retries; attempt++) { - try { - const job: any = this.client.createIndex(index); - return job.wait(10); - } catch (error: any) { - if (error.code === Aerospike.status.ERR_INDEX_FOUND) { - return; - } - if (attempt === retries - 1) { - return Promise.reject(error); - } + const job: any = this.client.createIndex(index) + .then((job: IndexJob) => { + job.wait(10) + return + }) + .catch((error: any) => { + if (error.code === Aerospike.status.ERR_INDEX_FOUND) { + return; } - }; + if (attempt === retries - 1) { + return Promise.reject(error); + } + }) + }; } remove(indexName: string) { From a8ec97c619f6f8d90dd4f8bbe2bd3671706ad3a4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:52:51 -0700 Subject: [PATCH 089/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- .github/workflows/bump-version.yml | 2 +- .github/workflows/dev-workflow-p2.yml | 28 +++++++++++++-------------- tsconfig.tsbuildinfo | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index cd6f183bc..89a6e0f6c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -267,7 +267,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 #slow --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index c88c43f5c..4efaed163 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -56,7 +56,7 @@ jobs: - name: Get current version id: get-current-version run: | - echo "current_version=$(node -p 'require(\"./package.json\").version')" >> $GITHUB_OUTPUT + echo "current_version=$(node -p 'require("./package.json").version')" >> $GITHUB_OUTPUT - name: Print current version run: echo "Current version is ${{ steps.get-current-version.outputs.current_version }}" diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index d2b537625..51684cf24 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -15,20 +15,20 @@ jobs: change: 'bump-dev-num' secrets: inherit - rebuild-artifacts-with-new-dev-num: - needs: bump-dev-number - name: Rebuild artifacts with new dev number - uses: ./.github/workflows/build-artifacts.yml - with: - # On pull_request_target, the bump version commit will be ignored - # So we must pass it manually to the workflow - sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} - secrets: inherit - - test-npm-install: - needs: rebuild-artifacts-with-new-dev-num - name: Test npm install command for npm package - uses: ./.github/workflows/npm-install-script-test.yml +# rebuild-artifacts-with-new-dev-num: +# needs: bump-dev-number +# name: Rebuild artifacts with new dev number +# uses: ./.github/workflows/build-artifacts.yml +# with: +# # On pull_request_target, the bump version commit will be ignored +# # So we must pass it manually to the workflow +# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} +# secrets: inherit +# +# test-npm-install: +# needs: rebuild-artifacts-with-new-dev-num +# name: Test npm install command for npm package +# uses: ./.github/workflows/npm-install-script-test.yml # upload-to-jfrog: # name: Upload artifacts to JFrog diff --git a/tsconfig.tsbuildinfo b/tsconfig.tsbuildinfo index 10c737808..3b9b65dab 100644 --- a/tsconfig.tsbuildinfo +++ b/tsconfig.tsbuildinfo @@ -1 +1 @@ -{"fileNames":["../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es5.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2016.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.dom.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.core.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2016.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.date.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.object.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.string.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.array.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.object.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.string.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.date.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.string.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.number.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.decorators.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.decorators.legacy.d.ts","./typings/index.d.ts","./node_modules/@types/unist/index.d.ts","./node_modules/@types/hast/index.d.ts","./node_modules/@types/json5/index.d.ts","./node_modules/@types/mdast/index.d.ts","./node_modules/@types/node/compatibility/disposable.d.ts","./node_modules/@types/node/compatibility/indexable.d.ts","./node_modules/@types/node/compatibility/iterators.d.ts","./node_modules/@types/node/compatibility/index.d.ts","./node_modules/@types/node/ts5.6/globals.typedarray.d.ts","./node_modules/@types/node/ts5.6/buffer.buffer.d.ts","./node_modules/undici-types/header.d.ts","./node_modules/undici-types/readable.d.ts","./node_modules/undici-types/file.d.ts","./node_modules/undici-types/fetch.d.ts","./node_modules/undici-types/formdata.d.ts","./node_modules/undici-types/connector.d.ts","./node_modules/undici-types/client.d.ts","./node_modules/undici-types/errors.d.ts","./node_modules/undici-types/dispatcher.d.ts","./node_modules/undici-types/global-dispatcher.d.ts","./node_modules/undici-types/global-origin.d.ts","./node_modules/undici-types/pool-stats.d.ts","./node_modules/undici-types/pool.d.ts","./node_modules/undici-types/handlers.d.ts","./node_modules/undici-types/balanced-pool.d.ts","./node_modules/undici-types/agent.d.ts","./node_modules/undici-types/mock-interceptor.d.ts","./node_modules/undici-types/mock-agent.d.ts","./node_modules/undici-types/mock-client.d.ts","./node_modules/undici-types/mock-pool.d.ts","./node_modules/undici-types/mock-errors.d.ts","./node_modules/undici-types/proxy-agent.d.ts","./node_modules/undici-types/env-http-proxy-agent.d.ts","./node_modules/undici-types/retry-handler.d.ts","./node_modules/undici-types/retry-agent.d.ts","./node_modules/undici-types/api.d.ts","./node_modules/undici-types/interceptors.d.ts","./node_modules/undici-types/util.d.ts","./node_modules/undici-types/cookies.d.ts","./node_modules/undici-types/patch.d.ts","./node_modules/undici-types/websocket.d.ts","./node_modules/undici-types/eventsource.d.ts","./node_modules/undici-types/filereader.d.ts","./node_modules/undici-types/diagnostics-channel.d.ts","./node_modules/undici-types/content-type.d.ts","./node_modules/undici-types/cache.d.ts","./node_modules/undici-types/index.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/sea.d.ts","./node_modules/@types/node/sqlite.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/ts5.6/index.d.ts"],"fileIdsList":[[56,98],[47,56,98],[56,95,98],[56,97,98],[56,98,103,133],[56,98,99,104,110,111,118,130,141],[56,98,99,100,110,118],[51,52,53,56,98],[56,98,101,142],[56,98,102,103,111,119],[56,98,103,130,138],[56,98,104,106,110,118],[56,97,98,105],[56,98,106,107],[56,98,110],[56,98,108,110],[56,97,98,110],[56,98,110,111,112,130,141],[56,98,110,111,112,125,130,133],[56,93,98,146],[56,93,98,106,110,113,118,130,141],[56,98,110,111,113,114,118,130,138,141],[56,98,113,115,130,138,141],[56,98,110,116],[56,98,117,141,146],[56,98,106,110,118,130],[56,98,119],[56,98,120],[56,97,98,121],[56,95,96,97,98,99,100,101,102,103,104,105,106,107,108,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147],[56,98,123],[56,98,124],[56,98,110,125,126],[56,98,125,127,142,144],[56,98,110,130,131,132,133],[56,98,130,132],[56,98,130,131],[56,98,133],[56,98,134],[56,95,98,130],[56,98,110,136,137],[56,98,136,137],[56,98,103,118,130,138],[56,98,139],[98],[54,55,56,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147],[56,98,118,140],[56,98,113,124,141],[56,98,103,142],[56,98,130,143],[56,98,117,144],[56,98,145],[56,98,103,110,112,121,130,141,144,146],[56,98,130,147],[56,65,69,98,141],[56,65,98,130,141],[56,60,98],[56,62,65,98,138,141],[56,98,118,138],[56,98,148],[56,60,98,148],[56,62,65,98,118,141],[56,57,58,61,64,98,110,130,141],[56,65,72,98],[56,57,63,98],[56,65,86,87,98],[56,61,65,98,133,141,148],[56,86,98,148],[56,59,60,98,148],[56,65,98],[56,59,60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,87,88,89,90,91,92,98],[56,65,80,98],[56,65,72,73,98],[56,63,65,73,74,98],[56,64,98],[56,57,60,65,98],[56,65,69,73,74,98],[56,69,98],[56,63,65,68,98,141],[56,57,62,65,72,98],[56,98,130],[56,60,65,86,98,146,148]],"fileInfos":[{"version":"44e584d4f6444f58791784f1d530875970993129442a847597db702a073ca68c","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"3facaf05f0c5fc569c5649dd359892c98a85557e3e0c847964caeb67076f4d75","impliedFormat":1},{"version":"9a68c0c07ae2fa71b44384a839b7b8d81662a236d4b9ac30916718f7510b1b2d","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"9e8ca8ed051c2697578c023d9c29d6df689a083561feba5c14aedee895853999","affectsGlobalScope":true,"impliedFormat":1},{"version":"6920e1448680767498a0b77c6a00a8e77d14d62c3da8967b171f1ddffa3c18e4","affectsGlobalScope":true,"impliedFormat":1},{"version":"dc2df20b1bcdc8c2d34af4926e2c3ab15ffe1160a63e58b7e09833f616efff44","affectsGlobalScope":true,"impliedFormat":1},{"version":"515d0b7b9bea2e31ea4ec968e9edd2c39d3eebf4a2d5cbd04e88639819ae3b71","affectsGlobalScope":true,"impliedFormat":1},{"version":"45d8ccb3dfd57355eb29749919142d4321a0aa4df6acdfc54e30433d7176600a","affectsGlobalScope":true,"impliedFormat":1},{"version":"0dc1e7ceda9b8b9b455c3a2d67b0412feab00bd2f66656cd8850e8831b08b537","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"4ff2a353abf8a80ee399af572debb8faab2d33ad38c4b4474cff7f26e7653b8d","affectsGlobalScope":true,"impliedFormat":1},{"version":"93495ff27b8746f55d19fcbcdbaccc99fd95f19d057aed1bd2c0cafe1335fbf0","affectsGlobalScope":true,"impliedFormat":1},{"version":"6fc23bb8c3965964be8c597310a2878b53a0306edb71d4b5a4dfe760186bcc01","affectsGlobalScope":true,"impliedFormat":1},{"version":"ea011c76963fb15ef1cdd7ce6a6808b46322c527de2077b6cfdf23ae6f5f9ec7","affectsGlobalScope":true,"impliedFormat":1},{"version":"38f0219c9e23c915ef9790ab1d680440d95419ad264816fa15009a8851e79119","affectsGlobalScope":true,"impliedFormat":1},{"version":"69ab18c3b76cd9b1be3d188eaf8bba06112ebbe2f47f6c322b5105a6fbc45a2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"4de680d5bb41c17f7f68e0419412ca23c98d5749dcaaea1896172f06435891fc","affectsGlobalScope":true,"impliedFormat":1},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac9538681b19688c8eae65811b329d3744af679e0bdfa5d842d0e32524c73e1c","affectsGlobalScope":true,"impliedFormat":1},{"version":"0a969edff4bd52585473d24995c5ef223f6652d6ef46193309b3921d65dd4376","affectsGlobalScope":true,"impliedFormat":1},{"version":"9e9fbd7030c440b33d021da145d3232984c8bb7916f277e8ffd3dc2e3eae2bdb","affectsGlobalScope":true,"impliedFormat":1},{"version":"811ec78f7fefcabbda4bfa93b3eb67d9ae166ef95f9bff989d964061cbf81a0c","affectsGlobalScope":true,"impliedFormat":1},{"version":"717937616a17072082152a2ef351cb51f98802fb4b2fdabd32399843875974ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"d7e7d9b7b50e5f22c915b525acc5a49a7a6584cf8f62d0569e557c5cfc4b2ac2","affectsGlobalScope":true,"impliedFormat":1},{"version":"71c37f4c9543f31dfced6c7840e068c5a5aacb7b89111a4364b1d5276b852557","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"74f7fa2d027d5b33eb0471c8e82a6c87216223181ec31247c357a3e8e2fddc5b","affectsGlobalScope":true,"impliedFormat":1},{"version":"1a94697425a99354df73d9c8291e2ecd4dddd370aed4023c2d6dee6cccb32666","affectsGlobalScope":true,"impliedFormat":1},{"version":"063600664504610fe3e99b717a1223f8b1900087fab0b4cad1496a114744f8df","affectsGlobalScope":true,"impliedFormat":1},{"version":"934019d7e3c81950f9a8426d093458b65d5aff2c7c1511233c0fd5b941e608ab","affectsGlobalScope":true,"impliedFormat":1},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true,"impliedFormat":1},{"version":"e3f9fc0ec0b96a9e642f11eda09c0be83a61c7b336977f8b9fdb1e9788e925fe","affectsGlobalScope":true,"impliedFormat":1},{"version":"59fb2c069260b4ba00b5643b907ef5d5341b167e7d1dbf58dfd895658bda2867","affectsGlobalScope":true,"impliedFormat":1},{"version":"479553e3779be7d4f68e9f40cdb82d038e5ef7592010100410723ceced22a0f7","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"33358442698bb565130f52ba79bfd3d4d484ac85fe33f3cb1759c54d18201393","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},"3393401d6e8160a105adc80feccd0b57b93198ad5689bcbd90966322f302bb72",{"version":"89121c1bf2990f5219bfd802a3e7fc557de447c62058d6af68d6b6348d64499a","impliedFormat":1},{"version":"79b4369233a12c6fa4a07301ecb7085802c98f3a77cf9ab97eee27e1656f82e6","impliedFormat":1},{"version":"96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","impliedFormat":1},{"version":"d4a22007b481fe2a2e6bfd3a42c00cd62d41edb36d30fc4697df2692e9891fc8","impliedFormat":1},{"version":"70521b6ab0dcba37539e5303104f29b721bfb2940b2776da4cc818c07e1fefc1","affectsGlobalScope":true,"impliedFormat":1},{"version":"030e350db2525514580ed054f712ffb22d273e6bc7eddc1bb7eda1e0ba5d395e","affectsGlobalScope":true,"impliedFormat":1},{"version":"d153a11543fd884b596587ccd97aebbeed950b26933ee000f94009f1ab142848","affectsGlobalScope":true,"impliedFormat":1},{"version":"21d819c173c0cf7cc3ce57c3276e77fd9a8a01d35a06ad87158781515c9a438a","impliedFormat":1},{"version":"613b21ccdf3be6329d56e6caa13b258c842edf8377be7bc9f014ed14cdcfc308","affectsGlobalScope":true,"impliedFormat":1},{"version":"2d1319e6b5d0efd8c5eae07eb864a00102151e8b9afddd2d45db52e9aae002c4","affectsGlobalScope":true,"impliedFormat":1},{"version":"5929864ce17fba74232584d90cb721a89b7ad277220627cc97054ba15a98ea8f","impliedFormat":1},{"version":"24bd580b5743dc56402c440dc7f9a4f5d592ad7a419f25414d37a7bfe11e342b","impliedFormat":1},{"version":"25c8056edf4314820382a5fdb4bb7816999acdcb929c8f75e3f39473b87e85bc","impliedFormat":1},{"version":"c464d66b20788266e5353b48dc4aa6bc0dc4a707276df1e7152ab0c9ae21fad8","impliedFormat":1},{"version":"78d0d27c130d35c60b5e5566c9f1e5be77caf39804636bc1a40133919a949f21","impliedFormat":1},{"version":"c6fd2c5a395f2432786c9cb8deb870b9b0e8ff7e22c029954fabdd692bff6195","impliedFormat":1},{"version":"1d6e127068ea8e104a912e42fc0a110e2aa5a66a356a917a163e8cf9a65e4a75","impliedFormat":1},{"version":"5ded6427296cdf3b9542de4471d2aa8d3983671d4cac0f4bf9c637208d1ced43","impliedFormat":1},{"version":"6bdc71028db658243775263e93a7db2fd2abfce3ca569c3cca5aee6ed5eb186d","impliedFormat":1},{"version":"cadc8aced301244057c4e7e73fbcae534b0f5b12a37b150d80e5a45aa4bebcbd","impliedFormat":1},{"version":"385aab901643aa54e1c36f5ef3107913b10d1b5bb8cbcd933d4263b80a0d7f20","impliedFormat":1},{"version":"9670d44354bab9d9982eca21945686b5c24a3f893db73c0dae0fd74217a4c219","impliedFormat":1},{"version":"0b8a9268adaf4da35e7fa830c8981cfa22adbbe5b3f6f5ab91f6658899e657a7","impliedFormat":1},{"version":"11396ed8a44c02ab9798b7dca436009f866e8dae3c9c25e8c1fbc396880bf1bb","impliedFormat":1},{"version":"ba7bc87d01492633cb5a0e5da8a4a42a1c86270e7b3d2dea5d156828a84e4882","impliedFormat":1},{"version":"4893a895ea92c85345017a04ed427cbd6a1710453338df26881a6019432febdd","impliedFormat":1},{"version":"c21dc52e277bcfc75fac0436ccb75c204f9e1b3fa5e12729670910639f27343e","impliedFormat":1},{"version":"13f6f39e12b1518c6650bbb220c8985999020fe0f21d818e28f512b7771d00f9","impliedFormat":1},{"version":"9b5369969f6e7175740bf51223112ff209f94ba43ecd3bb09eefff9fd675624a","impliedFormat":1},{"version":"4fe9e626e7164748e8769bbf74b538e09607f07ed17c2f20af8d680ee49fc1da","impliedFormat":1},{"version":"24515859bc0b836719105bb6cc3d68255042a9f02a6022b3187948b204946bd2","impliedFormat":1},{"version":"ea0148f897b45a76544ae179784c95af1bd6721b8610af9ffa467a518a086a43","impliedFormat":1},{"version":"24c6a117721e606c9984335f71711877293a9651e44f59f3d21c1ea0856f9cc9","impliedFormat":1},{"version":"dd3273ead9fbde62a72949c97dbec2247ea08e0c6952e701a483d74ef92d6a17","impliedFormat":1},{"version":"405822be75ad3e4d162e07439bac80c6bcc6dbae1929e179cf467ec0b9ee4e2e","impliedFormat":1},{"version":"0db18c6e78ea846316c012478888f33c11ffadab9efd1cc8bcc12daded7a60b6","impliedFormat":1},{"version":"e61be3f894b41b7baa1fbd6a66893f2579bfad01d208b4ff61daef21493ef0a8","impliedFormat":1},{"version":"bd0532fd6556073727d28da0edfd1736417a3f9f394877b6d5ef6ad88fba1d1a","impliedFormat":1},{"version":"89167d696a849fce5ca508032aabfe901c0868f833a8625d5a9c6e861ef935d2","impliedFormat":1},{"version":"615ba88d0128ed16bf83ef8ccbb6aff05c3ee2db1cc0f89ab50a4939bfc1943f","impliedFormat":1},{"version":"a4d551dbf8746780194d550c88f26cf937caf8d56f102969a110cfaed4b06656","impliedFormat":1},{"version":"8bd86b8e8f6a6aa6c49b71e14c4ffe1211a0e97c80f08d2c8cc98838006e4b88","impliedFormat":1},{"version":"317e63deeb21ac07f3992f5b50cdca8338f10acd4fbb7257ebf56735bf52ab00","impliedFormat":1},{"version":"4732aec92b20fb28c5fe9ad99521fb59974289ed1e45aecb282616202184064f","impliedFormat":1},{"version":"2e85db9e6fd73cfa3d7f28e0ab6b55417ea18931423bd47b409a96e4a169e8e6","impliedFormat":1},{"version":"c46e079fe54c76f95c67fb89081b3e399da2c7d109e7dca8e4b58d83e332e605","impliedFormat":1},{"version":"bf67d53d168abc1298888693338cb82854bdb2e69ef83f8a0092093c2d562107","impliedFormat":1},{"version":"81184fe8e67d78ac4e5374650f0892d547d665d77da2b2f544b5d84729c4a15d","affectsGlobalScope":true,"impliedFormat":1},{"version":"f52e8dacc97d71dcc96af29e49584353f9c54cb916d132e3e768d8b8129c928d","impliedFormat":1},{"version":"7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419","impliedFormat":1},{"version":"76103716ba397bbb61f9fa9c9090dca59f39f9047cb1352b2179c5d8e7f4e8d0","impliedFormat":1},{"version":"53eac70430b30089a3a1959d8306b0f9cfaf0de75224b68ef25243e0b5ad1ca3","affectsGlobalScope":true,"impliedFormat":1},{"version":"4314c7a11517e221f7296b46547dbc4df047115b182f544d072bdccffa57fc72","impliedFormat":1},{"version":"115971d64632ea4742b5b115fb64ed04bcaae2c3c342f13d9ba7e3f9ee39c4e7","impliedFormat":1},{"version":"c2510f124c0293ab80b1777c44d80f812b75612f297b9857406468c0f4dafe29","affectsGlobalScope":true,"impliedFormat":1},{"version":"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","impliedFormat":1},{"version":"86956cc2eb9dd371d6fab493d326a574afedebf76eef3fa7833b8e0d9b52d6f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"24642567d3729bcc545bacb65ee7c0db423400c7f1ef757cab25d05650064f98","impliedFormat":1},{"version":"e6f5a38687bebe43a4cef426b69d34373ef68be9a6b1538ec0a371e69f309354","impliedFormat":1},{"version":"a6bf63d17324010ca1fbf0389cab83f93389bb0b9a01dc8a346d092f65b3605f","impliedFormat":1},{"version":"e009777bef4b023a999b2e5b9a136ff2cde37dc3f77c744a02840f05b18be8ff","impliedFormat":1},{"version":"1e0d1f8b0adfa0b0330e028c7941b5a98c08b600efe7f14d2d2a00854fb2f393","impliedFormat":1},{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true,"impliedFormat":1},{"version":"875928df2f3e9a3aed4019539a15d04ff6140a06df6cd1b2feb836d22a81eaca","affectsGlobalScope":true,"impliedFormat":1},{"version":"e9ad08a376ac84948fcca0013d6f1d4ae4f9522e26b91f87945b97c99d7cc30b","impliedFormat":1},{"version":"eaf9ee1d90a35d56264f0bf39842282c58b9219e112ac7d0c1bce98c6c5da672","impliedFormat":1},{"version":"c15c4427ae7fd1dcd7f312a8a447ac93581b0d4664ddf151ecd07de4bf2bb9d7","impliedFormat":1},{"version":"5135bdd72cc05a8192bd2e92f0914d7fc43ee077d1293dc622a049b7035a0afb","impliedFormat":1},{"version":"4f80de3a11c0d2f1329a72e92c7416b2f7eab14f67e92cac63bb4e8d01c6edc8","impliedFormat":1},{"version":"6d386bc0d7f3afa1d401afc3e00ed6b09205a354a9795196caed937494a713e6","impliedFormat":1},{"version":"75c3400359d59fae5aed4c4a59fcd8a9760cf451e25dc2174cb5e08b9d4803e2","affectsGlobalScope":true,"impliedFormat":1},{"version":"94c4187083503a74f4544503b5a30e2bd7af0032dc739b0c9a7ce87f8bddc7b9","impliedFormat":1},{"version":"b1b6ee0d012aeebe11d776a155d8979730440082797695fc8e2a5c326285678f","impliedFormat":1},{"version":"45875bcae57270aeb3ebc73a5e3fb4c7b9d91d6b045f107c1d8513c28ece71c0","impliedFormat":1},{"version":"3eb62baae4df08c9173e6903d3ca45942ccec8c3659b0565684a75f3292cffbb","affectsGlobalScope":true,"impliedFormat":1},{"version":"a85683ef86875f4ad4c6b7301bbcc63fb379a8d80d3d3fd735ee57f48ef8a47e","affectsGlobalScope":true,"impliedFormat":1},{"version":"3f16a7e4deafa527ed9995a772bb380eb7d3c2c0fd4ae178c5263ed18394db2c","impliedFormat":1},{"version":"c6b4e0a02545304935ecbf7de7a8e056a31bb50939b5b321c9d50a405b5a0bba","impliedFormat":1},{"version":"fab29e6d649aa074a6b91e3bdf2bff484934a46067f6ee97a30fcd9762ae2213","impliedFormat":1},{"version":"8145e07aad6da5f23f2fcd8c8e4c5c13fb26ee986a79d03b0829b8fce152d8b2","impliedFormat":1},{"version":"e1120271ebbc9952fdc7b2dd3e145560e52e06956345e6fdf91d70ca4886464f","impliedFormat":1},{"version":"15c5e91b5f08be34a78e3d976179bf5b7a9cc28dc0ef1ffebffeb3c7812a2dca","impliedFormat":1},{"version":"a8f06c2382a30b7cb89ad2dfc48fc3b2b490f3dafcd839dadc008e4e5d57031d","impliedFormat":1},{"version":"553870e516f8c772b89f3820576152ebc70181d7994d96917bb943e37da7f8a7","impliedFormat":1},{"version":"37ba7b45141a45ce6e80e66f2a96c8a5ab1bcef0fc2d0f56bb58df96ec67e972","impliedFormat":1},{"version":"93452d394fdd1dc551ec62f5042366f011a00d342d36d50793b3529bfc9bd633","impliedFormat":1},{"version":"745c4240220559bd340c8aeb6e3c5270a709d3565e934dc22a69c304703956bc","affectsGlobalScope":true,"impliedFormat":1},{"version":"2754d8221d77c7b382096651925eb476f1066b3348da4b73fe71ced7801edada","impliedFormat":1},{"version":"9212c6e9d80cb45441a3614e95afd7235a55a18584c2ed32d6c1aca5a0c53d93","affectsGlobalScope":true,"impliedFormat":1},{"version":"bef91efa0baea5d0e0f0f27b574a8bc100ce62a6d7e70220a0d58af6acab5e89","affectsGlobalScope":true,"impliedFormat":1},{"version":"282fd2a1268a25345b830497b4b7bf5037a5e04f6a9c44c840cb605e19fea841","impliedFormat":1},{"version":"5360a27d3ebca11b224d7d3e38e3e2c63f8290cb1fcf6c3610401898f8e68bc3","impliedFormat":1},{"version":"66ba1b2c3e3a3644a1011cd530fb444a96b1b2dfe2f5e837a002d41a1a799e60","impliedFormat":1},{"version":"7e514f5b852fdbc166b539fdd1f4e9114f29911592a5eb10a94bb3a13ccac3c4","impliedFormat":1},{"version":"7d6ff413e198d25639f9f01f16673e7df4e4bd2875a42455afd4ecc02ef156da","affectsGlobalScope":true,"impliedFormat":1},{"version":"6bd91a2a356600dee28eb0438082d0799a18a974a6537c4410a796bab749813c","affectsGlobalScope":true,"impliedFormat":1},{"version":"f689c4237b70ae6be5f0e4180e8833f34ace40529d1acc0676ab8fb8f70457d7","impliedFormat":1},{"version":"ae25afbbf1ed5df63a177d67b9048bf7481067f1b8dc9c39212e59db94fc9fc6","impliedFormat":1},{"version":"ac5ed35e649cdd8143131964336ab9076937fa91802ec760b3ea63b59175c10a","impliedFormat":1},{"version":"52a8e7e8a1454b6d1b5ad428efae3870ffc56f2c02d923467f2940c454aa9aec","affectsGlobalScope":true,"impliedFormat":1},{"version":"78dc0513cc4f1642906b74dda42146bcbd9df7401717d6e89ea6d72d12ecb539","impliedFormat":1},{"version":"171fd8807643c46a9d17e843959abdf10480d57d60d38d061fb44a4c8d4a8cc4","impliedFormat":1}],"root":[46],"options":{"allowJs":true,"alwaysStrict":true,"declaration":true,"emitDeclarationOnly":true,"emitDecoratorMetadata":true,"esModuleInterop":true,"experimentalDecorators":true,"importHelpers":true,"module":1,"noEmitHelpers":true,"noImplicitAny":false,"removeComments":true,"skipLibCheck":true,"strict":true,"target":1},"referencedMap":[[44,1],[45,1],[8,1],[10,1],[9,1],[2,1],[11,1],[12,1],[13,1],[14,1],[15,1],[16,1],[17,1],[18,1],[3,1],[19,1],[4,1],[20,1],[24,1],[21,1],[22,1],[23,1],[25,1],[26,1],[27,1],[5,1],[28,1],[29,1],[30,1],[31,1],[6,1],[35,1],[32,1],[33,1],[34,1],[36,1],[7,1],[37,1],[42,1],[43,1],[38,1],[39,1],[40,1],[41,1],[1,1],[48,2],[49,1],[50,2],[95,3],[96,3],[97,4],[98,5],[99,6],[100,7],[51,1],[54,8],[52,1],[53,1],[101,9],[102,10],[103,11],[104,12],[105,13],[106,14],[107,14],[109,15],[108,16],[110,17],[111,18],[112,19],[94,20],[113,21],[114,22],[115,23],[116,24],[117,25],[118,26],[119,27],[120,28],[121,29],[122,30],[123,31],[124,32],[125,33],[126,33],[127,34],[128,1],[129,1],[130,35],[132,36],[131,37],[133,38],[134,39],[135,40],[136,41],[137,42],[138,43],[139,44],[56,45],[55,1],[148,46],[140,47],[141,48],[142,49],[143,50],[144,51],[145,52],[146,53],[147,54],[47,1],[72,55],[82,56],[71,55],[92,57],[63,58],[62,59],[91,60],[85,61],[90,62],[65,63],[79,64],[64,65],[88,66],[60,67],[59,60],[89,68],[61,69],[66,70],[67,1],[70,70],[57,1],[93,71],[83,72],[74,73],[75,74],[77,75],[73,76],[76,77],[86,60],[68,78],[69,79],[78,80],[58,81],[81,72],[80,70],[84,1],[87,82],[46,81]],"version":"5.6.3"} \ No newline at end of file +{"program":{"fileNames":["../../../../../usr/share/nodejs/typescript/lib/lib.es5.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2016.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2017.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2018.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2019.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2020.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.dom.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.core.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.collection.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.generator.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.iterable.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.promise.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.proxy.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.reflect.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.symbol.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2016.array.include.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2017.object.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2017.string.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2017.intl.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2017.typedarrays.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2018.asynciterable.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2018.intl.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2018.promise.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2018.regexp.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2019.array.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2019.object.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2019.string.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2019.symbol.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2020.bigint.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2020.promise.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2020.string.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../../../usr/share/nodejs/typescript/lib/lib.es2020.intl.d.ts","./typings/index.d.ts","./node_modules/@types/unist/index.d.ts","./node_modules/@types/hast/index.d.ts","./node_modules/@types/json5/index.d.ts","./node_modules/@types/mdast/index.d.ts","./node_modules/@types/node/compatibility/disposable.d.ts","./node_modules/@types/node/compatibility/indexable.d.ts","./node_modules/@types/node/compatibility/iterators.d.ts","./node_modules/@types/node/compatibility/index.d.ts","./node_modules/@types/node/ts5.6/globals.typedarray.d.ts","./node_modules/@types/node/ts5.6/buffer.buffer.d.ts","./node_modules/undici-types/header.d.ts","./node_modules/undici-types/readable.d.ts","./node_modules/undici-types/file.d.ts","./node_modules/undici-types/fetch.d.ts","./node_modules/undici-types/formdata.d.ts","./node_modules/undici-types/connector.d.ts","./node_modules/undici-types/client.d.ts","./node_modules/undici-types/errors.d.ts","./node_modules/undici-types/dispatcher.d.ts","./node_modules/undici-types/global-dispatcher.d.ts","./node_modules/undici-types/global-origin.d.ts","./node_modules/undici-types/pool-stats.d.ts","./node_modules/undici-types/pool.d.ts","./node_modules/undici-types/handlers.d.ts","./node_modules/undici-types/balanced-pool.d.ts","./node_modules/undici-types/agent.d.ts","./node_modules/undici-types/mock-interceptor.d.ts","./node_modules/undici-types/mock-agent.d.ts","./node_modules/undici-types/mock-client.d.ts","./node_modules/undici-types/mock-pool.d.ts","./node_modules/undici-types/mock-errors.d.ts","./node_modules/undici-types/proxy-agent.d.ts","./node_modules/undici-types/env-http-proxy-agent.d.ts","./node_modules/undici-types/retry-handler.d.ts","./node_modules/undici-types/retry-agent.d.ts","./node_modules/undici-types/api.d.ts","./node_modules/undici-types/interceptors.d.ts","./node_modules/undici-types/util.d.ts","./node_modules/undici-types/cookies.d.ts","./node_modules/undici-types/patch.d.ts","./node_modules/undici-types/websocket.d.ts","./node_modules/undici-types/eventsource.d.ts","./node_modules/undici-types/filereader.d.ts","./node_modules/undici-types/diagnostics-channel.d.ts","./node_modules/undici-types/content-type.d.ts","./node_modules/undici-types/cache.d.ts","./node_modules/undici-types/index.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/sea.d.ts","./node_modules/@types/node/sqlite.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/ts5.6/index.d.ts"],"fileInfos":[{"version":"dadcdf3a8c37080fb5bc64750a3c27b178e376ff02142f6df03ac0778850b622","affectsGlobalScope":true},"e8d2e50f9e8fdd312d31f97571b4c7295b8f29f7f8363498edae2a9eb113ee36","4b1854aec637e8e041eff02899e16fd3c0c78685c622336aadfd67e6604bbe1b","d6f7d47355a0167969e9a8eedfb0994f21e038d360965ec06c30f6871038900b","4735756aff7c5857de387f321633f272e2daba4950c427ab200de954340c7c13","4cac3201303b24c71d334bcdab63aee38b7424f51ba9f8884515705b7cba7606","f59097764af44b6038195f8ef1ac7fb21a8ab5ca66585982e3028430c6846ed6",{"version":"4ccd8a7993c9cfb684fefc2d082674cbd1ee1bfc2e58df6e4320b729f8efdea6","affectsGlobalScope":true},{"version":"1698099d91846788bb88832710d14690d1474ac5b911a4cc40c40640202549af","affectsGlobalScope":true},{"version":"5a8c535851f6cb0d376f135a2a6640dec8070d48d03072c2f1ab70528d7cb4fe","affectsGlobalScope":true},{"version":"28065193ddf88bf697915b9236d2d00a27e85726563e88474f166790376e10d8","affectsGlobalScope":true},{"version":"5ae8604583db39e78e2d0a0685186f2cb6816fcd107e4ec290aa21d67dc6d64e","affectsGlobalScope":true},{"version":"93244f18d7b4e03df9b368257cdbcc90e7f833c9fd473213c4d182d02bde5df6","affectsGlobalScope":true},{"version":"fabe256ae14920149045215ce771a898aa2698b1b91fabaf5b716b53a33e9f8e","affectsGlobalScope":true},{"version":"6bea5787583501f63a4038b4d90962d044f99ac739dda29d03bc0ce6702b8fba","affectsGlobalScope":true},{"version":"e5d8d715990d96a37f3521a3f1460679507b261eec1b42dc84d4de835997b794","affectsGlobalScope":true},{"version":"622b6f32c2b022056eaced4449675b73b963d2c95e812e7c994e9a1d678395e5","affectsGlobalScope":true},{"version":"a003a6051b48dc64eaa8ad83789e4c2a540f3482bed821053b6770969bd598fb","affectsGlobalScope":true},{"version":"e90857fa86cecc3bc964a2d7db9d95a0c406bebfadeb4853a01a0079936f12f7","affectsGlobalScope":true},{"version":"8bbb03589e48f10b49996064f35256e858d205dcb364428fb4cc045061b1d786","affectsGlobalScope":true},{"version":"5044747370afee4b4c247e8a14c2969d245bbcf8396295dc5a60c659d796a71f","affectsGlobalScope":true},{"version":"d42841f3fb4fc368f35cba018a81bd0b38f1d00ae9b0449a63ab47ac1bcaba10","affectsGlobalScope":true},{"version":"a894424c7058bcc77c1a3c92fe289c0ff93792e583e064c683d021879479f7b8","affectsGlobalScope":true},{"version":"8f03386d697248c5d356fd53f2729b920ea124cd1414a6c22de03c5d24729277","affectsGlobalScope":true},{"version":"21ac76354ecc1324ee2e31ac5fcebfa91b1b6beb3e8c3fe6f3988538e9629c73","affectsGlobalScope":true},{"version":"0f71e010899461f256a976d1bece8f39710a8661ced0ae3a4a757f61e0b0200d","affectsGlobalScope":true},{"version":"fe7acdc1039eca904399190766d1c8766b7d2621413f972c8542dddd69612097","affectsGlobalScope":true},{"version":"c25aa843b930662d62f0e853dd1f347d08b66cdec09bd760151d4ba6ce220fe6","affectsGlobalScope":true},{"version":"3e47477f297e4fa0d556c40a872c2c45bddefa487fd054bf1f80bceb527a682b","affectsGlobalScope":true},{"version":"a902be9f4116b449dbac07ffe3f4d69abb664f8eddfaeb892225612469213788","affectsGlobalScope":true},{"version":"155d8d1e367e05af5e5708a860825785f00eabae01744cf7bc569664301415a4","affectsGlobalScope":true},{"version":"5b30b81cdeb239772daf44e6c0d5bf6adec9dbf8d534ed25c9a0e8a43b9abfff","affectsGlobalScope":true},{"version":"061f40294b7ad6ac2167c63159a20a50cee9f90299bf15584c35b251fef62990","affectsGlobalScope":true},{"version":"d836a4258d6b5ee12054b802002d7c9c5eb6a1adb6a654f0ee9429cbda03e1a0","affectsGlobalScope":true},{"version":"c021bff90eb33d29edfde16c9b861097bbf99aa290726d0d0ac65330aa7be85a","affectsGlobalScope":true},{"version":"1c4e64dc374ea5922d7632a52b167187ba7c7e35b34d3c1e22625be66ca1576d","affectsGlobalScope":true},{"version":"cd1bebc4db8fb52c5618ecad3f511f62c78921451c198220c5b2ee5610b4d7b9","affectsGlobalScope":true},{"version":"60232641bf6d841a87a1a6b1712c981fbf19101716f3ef061c325e4b15fcf616","affectsGlobalScope":true},"3393401d6e8160a105adc80feccd0b57b93198ad5689bcbd90966322f302bb72","89121c1bf2990f5219bfd802a3e7fc557de447c62058d6af68d6b6348d64499a","79b4369233a12c6fa4a07301ecb7085802c98f3a77cf9ab97eee27e1656f82e6","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","d4a22007b481fe2a2e6bfd3a42c00cd62d41edb36d30fc4697df2692e9891fc8",{"version":"70521b6ab0dcba37539e5303104f29b721bfb2940b2776da4cc818c07e1fefc1","affectsGlobalScope":true},{"version":"030e350db2525514580ed054f712ffb22d273e6bc7eddc1bb7eda1e0ba5d395e","affectsGlobalScope":true},{"version":"d153a11543fd884b596587ccd97aebbeed950b26933ee000f94009f1ab142848","affectsGlobalScope":true},"21d819c173c0cf7cc3ce57c3276e77fd9a8a01d35a06ad87158781515c9a438a",{"version":"613b21ccdf3be6329d56e6caa13b258c842edf8377be7bc9f014ed14cdcfc308","affectsGlobalScope":true},{"version":"2d1319e6b5d0efd8c5eae07eb864a00102151e8b9afddd2d45db52e9aae002c4","affectsGlobalScope":true},"5929864ce17fba74232584d90cb721a89b7ad277220627cc97054ba15a98ea8f","24bd580b5743dc56402c440dc7f9a4f5d592ad7a419f25414d37a7bfe11e342b","25c8056edf4314820382a5fdb4bb7816999acdcb929c8f75e3f39473b87e85bc","c464d66b20788266e5353b48dc4aa6bc0dc4a707276df1e7152ab0c9ae21fad8","78d0d27c130d35c60b5e5566c9f1e5be77caf39804636bc1a40133919a949f21","c6fd2c5a395f2432786c9cb8deb870b9b0e8ff7e22c029954fabdd692bff6195","1d6e127068ea8e104a912e42fc0a110e2aa5a66a356a917a163e8cf9a65e4a75","5ded6427296cdf3b9542de4471d2aa8d3983671d4cac0f4bf9c637208d1ced43","6bdc71028db658243775263e93a7db2fd2abfce3ca569c3cca5aee6ed5eb186d","cadc8aced301244057c4e7e73fbcae534b0f5b12a37b150d80e5a45aa4bebcbd","385aab901643aa54e1c36f5ef3107913b10d1b5bb8cbcd933d4263b80a0d7f20","9670d44354bab9d9982eca21945686b5c24a3f893db73c0dae0fd74217a4c219","0b8a9268adaf4da35e7fa830c8981cfa22adbbe5b3f6f5ab91f6658899e657a7","11396ed8a44c02ab9798b7dca436009f866e8dae3c9c25e8c1fbc396880bf1bb","ba7bc87d01492633cb5a0e5da8a4a42a1c86270e7b3d2dea5d156828a84e4882","4893a895ea92c85345017a04ed427cbd6a1710453338df26881a6019432febdd","c21dc52e277bcfc75fac0436ccb75c204f9e1b3fa5e12729670910639f27343e","13f6f39e12b1518c6650bbb220c8985999020fe0f21d818e28f512b7771d00f9","9b5369969f6e7175740bf51223112ff209f94ba43ecd3bb09eefff9fd675624a","4fe9e626e7164748e8769bbf74b538e09607f07ed17c2f20af8d680ee49fc1da","24515859bc0b836719105bb6cc3d68255042a9f02a6022b3187948b204946bd2","ea0148f897b45a76544ae179784c95af1bd6721b8610af9ffa467a518a086a43","24c6a117721e606c9984335f71711877293a9651e44f59f3d21c1ea0856f9cc9","dd3273ead9fbde62a72949c97dbec2247ea08e0c6952e701a483d74ef92d6a17","405822be75ad3e4d162e07439bac80c6bcc6dbae1929e179cf467ec0b9ee4e2e","0db18c6e78ea846316c012478888f33c11ffadab9efd1cc8bcc12daded7a60b6","e61be3f894b41b7baa1fbd6a66893f2579bfad01d208b4ff61daef21493ef0a8","bd0532fd6556073727d28da0edfd1736417a3f9f394877b6d5ef6ad88fba1d1a","89167d696a849fce5ca508032aabfe901c0868f833a8625d5a9c6e861ef935d2","615ba88d0128ed16bf83ef8ccbb6aff05c3ee2db1cc0f89ab50a4939bfc1943f","a4d551dbf8746780194d550c88f26cf937caf8d56f102969a110cfaed4b06656","8bd86b8e8f6a6aa6c49b71e14c4ffe1211a0e97c80f08d2c8cc98838006e4b88","317e63deeb21ac07f3992f5b50cdca8338f10acd4fbb7257ebf56735bf52ab00","4732aec92b20fb28c5fe9ad99521fb59974289ed1e45aecb282616202184064f","2e85db9e6fd73cfa3d7f28e0ab6b55417ea18931423bd47b409a96e4a169e8e6","c46e079fe54c76f95c67fb89081b3e399da2c7d109e7dca8e4b58d83e332e605","bf67d53d168abc1298888693338cb82854bdb2e69ef83f8a0092093c2d562107",{"version":"81184fe8e67d78ac4e5374650f0892d547d665d77da2b2f544b5d84729c4a15d","affectsGlobalScope":true},"f52e8dacc97d71dcc96af29e49584353f9c54cb916d132e3e768d8b8129c928d","7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419","76103716ba397bbb61f9fa9c9090dca59f39f9047cb1352b2179c5d8e7f4e8d0",{"version":"53eac70430b30089a3a1959d8306b0f9cfaf0de75224b68ef25243e0b5ad1ca3","affectsGlobalScope":true},"4314c7a11517e221f7296b46547dbc4df047115b182f544d072bdccffa57fc72","115971d64632ea4742b5b115fb64ed04bcaae2c3c342f13d9ba7e3f9ee39c4e7",{"version":"c2510f124c0293ab80b1777c44d80f812b75612f297b9857406468c0f4dafe29","affectsGlobalScope":true},"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb",{"version":"86956cc2eb9dd371d6fab493d326a574afedebf76eef3fa7833b8e0d9b52d6f1","affectsGlobalScope":true},"24642567d3729bcc545bacb65ee7c0db423400c7f1ef757cab25d05650064f98","e6f5a38687bebe43a4cef426b69d34373ef68be9a6b1538ec0a371e69f309354","a6bf63d17324010ca1fbf0389cab83f93389bb0b9a01dc8a346d092f65b3605f","e009777bef4b023a999b2e5b9a136ff2cde37dc3f77c744a02840f05b18be8ff","1e0d1f8b0adfa0b0330e028c7941b5a98c08b600efe7f14d2d2a00854fb2f393",{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true},{"version":"875928df2f3e9a3aed4019539a15d04ff6140a06df6cd1b2feb836d22a81eaca","affectsGlobalScope":true},"e9ad08a376ac84948fcca0013d6f1d4ae4f9522e26b91f87945b97c99d7cc30b","eaf9ee1d90a35d56264f0bf39842282c58b9219e112ac7d0c1bce98c6c5da672","c15c4427ae7fd1dcd7f312a8a447ac93581b0d4664ddf151ecd07de4bf2bb9d7","5135bdd72cc05a8192bd2e92f0914d7fc43ee077d1293dc622a049b7035a0afb","4f80de3a11c0d2f1329a72e92c7416b2f7eab14f67e92cac63bb4e8d01c6edc8","6d386bc0d7f3afa1d401afc3e00ed6b09205a354a9795196caed937494a713e6",{"version":"75c3400359d59fae5aed4c4a59fcd8a9760cf451e25dc2174cb5e08b9d4803e2","affectsGlobalScope":true},"94c4187083503a74f4544503b5a30e2bd7af0032dc739b0c9a7ce87f8bddc7b9","b1b6ee0d012aeebe11d776a155d8979730440082797695fc8e2a5c326285678f","45875bcae57270aeb3ebc73a5e3fb4c7b9d91d6b045f107c1d8513c28ece71c0",{"version":"3eb62baae4df08c9173e6903d3ca45942ccec8c3659b0565684a75f3292cffbb","affectsGlobalScope":true},{"version":"a85683ef86875f4ad4c6b7301bbcc63fb379a8d80d3d3fd735ee57f48ef8a47e","affectsGlobalScope":true},"3f16a7e4deafa527ed9995a772bb380eb7d3c2c0fd4ae178c5263ed18394db2c","c6b4e0a02545304935ecbf7de7a8e056a31bb50939b5b321c9d50a405b5a0bba","fab29e6d649aa074a6b91e3bdf2bff484934a46067f6ee97a30fcd9762ae2213","8145e07aad6da5f23f2fcd8c8e4c5c13fb26ee986a79d03b0829b8fce152d8b2","e1120271ebbc9952fdc7b2dd3e145560e52e06956345e6fdf91d70ca4886464f","15c5e91b5f08be34a78e3d976179bf5b7a9cc28dc0ef1ffebffeb3c7812a2dca","a8f06c2382a30b7cb89ad2dfc48fc3b2b490f3dafcd839dadc008e4e5d57031d","553870e516f8c772b89f3820576152ebc70181d7994d96917bb943e37da7f8a7","37ba7b45141a45ce6e80e66f2a96c8a5ab1bcef0fc2d0f56bb58df96ec67e972","93452d394fdd1dc551ec62f5042366f011a00d342d36d50793b3529bfc9bd633",{"version":"745c4240220559bd340c8aeb6e3c5270a709d3565e934dc22a69c304703956bc","affectsGlobalScope":true},"2754d8221d77c7b382096651925eb476f1066b3348da4b73fe71ced7801edada",{"version":"9212c6e9d80cb45441a3614e95afd7235a55a18584c2ed32d6c1aca5a0c53d93","affectsGlobalScope":true},{"version":"bef91efa0baea5d0e0f0f27b574a8bc100ce62a6d7e70220a0d58af6acab5e89","affectsGlobalScope":true},"282fd2a1268a25345b830497b4b7bf5037a5e04f6a9c44c840cb605e19fea841","5360a27d3ebca11b224d7d3e38e3e2c63f8290cb1fcf6c3610401898f8e68bc3","66ba1b2c3e3a3644a1011cd530fb444a96b1b2dfe2f5e837a002d41a1a799e60","7e514f5b852fdbc166b539fdd1f4e9114f29911592a5eb10a94bb3a13ccac3c4",{"version":"7d6ff413e198d25639f9f01f16673e7df4e4bd2875a42455afd4ecc02ef156da","affectsGlobalScope":true},{"version":"6bd91a2a356600dee28eb0438082d0799a18a974a6537c4410a796bab749813c","affectsGlobalScope":true},"f689c4237b70ae6be5f0e4180e8833f34ace40529d1acc0676ab8fb8f70457d7","ae25afbbf1ed5df63a177d67b9048bf7481067f1b8dc9c39212e59db94fc9fc6","ac5ed35e649cdd8143131964336ab9076937fa91802ec760b3ea63b59175c10a",{"version":"52a8e7e8a1454b6d1b5ad428efae3870ffc56f2c02d923467f2940c454aa9aec","affectsGlobalScope":true},"78dc0513cc4f1642906b74dda42146bcbd9df7401717d6e89ea6d72d12ecb539","171fd8807643c46a9d17e843959abdf10480d57d60d38d061fb44a4c8d4a8cc4"],"options":{"declaration":true,"emitDeclarationOnly":true,"emitDecoratorMetadata":true,"esModuleInterop":true,"experimentalDecorators":true,"importHelpers":true,"module":1,"noEmitHelpers":true,"noImplicitAny":false,"removeComments":true,"skipLibCheck":true,"strict":true,"target":1},"fileIdsList":[[40,49,91],[49,91],[49,88,91],[49,90,91],[49,91,96,126],[49,91,92,97,103,104,111,123,134],[49,91,92,93,103,111],[44,45,46,49,91],[49,91,94,135],[49,91,95,96,104,112],[49,91,96,123,131],[49,91,97,99,103,111],[49,90,91,98],[49,91,99,100],[49,91,103],[49,91,101,103],[49,90,91,103],[49,91,103,104,105,123,134],[49,91,103,104,105,118,123,126],[49,86,91,139],[49,86,91,99,103,106,111,123,134],[49,91,103,104,106,107,111,123,131,134],[49,91,106,108,123,131,134],[49,91,103,109],[49,91,110,134,139],[49,91,99,103,111,123],[49,91,112],[49,91,113],[49,90,91,114],[49,88,89,90,91,92,93,94,95,96,97,98,99,100,101,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140],[49,91,116],[49,91,117],[49,91,103,118,119],[49,91,118,120,135,137],[49,91,103,123,124,125,126],[49,91,123,125],[49,91,123,124],[49,91,126],[49,91,127],[49,88,91,123],[49,91,103,129,130],[49,91,129,130],[49,91,96,111,123,131],[49,91,132],[91],[47,48,49,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140],[49,91,111,133],[49,91,106,117,134],[49,91,96,135],[49,91,123,136],[49,91,110,137],[49,91,138],[49,91,96,103,105,114,123,134,137,139],[49,91,123,140],[49,58,62,91,134],[49,58,91,123,134],[49,53,91],[49,55,58,91,131,134],[49,91,111,131],[49,91,141],[49,53,91,141],[49,55,58,91,111,134],[49,50,51,54,57,91,103,123,134],[49,58,65,91],[49,50,56,91],[49,58,79,80,91],[49,54,58,91,126,134,141],[49,79,91,141],[49,52,53,91,141],[49,58,91],[49,52,53,54,55,56,57,58,59,60,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,80,81,82,83,84,85,91],[49,58,73,91],[49,58,65,66,91],[49,56,58,66,67,91],[49,57,91],[49,50,53,58,91],[49,58,62,66,67,91],[49,62,91],[49,56,58,61,91,134],[49,50,55,58,65,91],[49,91,123],[49,53,58,79,91,139,141]],"referencedMap":[[41,1],[42,2],[43,1],[88,3],[89,3],[90,4],[91,5],[92,6],[93,7],[44,2],[47,8],[45,2],[46,2],[94,9],[95,10],[96,11],[97,12],[98,13],[99,14],[100,14],[102,15],[101,16],[103,17],[104,18],[105,19],[87,20],[106,21],[107,22],[108,23],[109,24],[110,25],[111,26],[112,27],[113,28],[114,29],[115,30],[116,31],[117,32],[118,33],[119,33],[120,34],[121,2],[122,2],[123,35],[125,36],[124,37],[126,38],[127,39],[128,40],[129,41],[130,42],[131,43],[132,44],[49,45],[48,2],[141,46],[133,47],[134,48],[135,49],[136,50],[137,51],[138,52],[139,53],[140,54],[40,2],[65,55],[75,56],[64,55],[85,57],[56,58],[55,59],[84,60],[78,61],[83,62],[58,63],[72,64],[57,65],[81,66],[53,67],[52,60],[82,68],[54,69],[59,70],[60,2],[63,70],[50,2],[86,71],[76,72],[67,73],[68,74],[70,75],[66,76],[69,77],[79,60],[61,78],[62,79],[71,80],[51,81],[74,72],[73,70],[77,2],[80,82],[39,81],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[30,2],[31,2],[32,2],[33,2],[7,2],[38,2],[34,2],[35,2],[36,2],[37,2],[1,2]],"exportedModulesMap":[[41,1],[42,2],[43,1],[88,3],[89,3],[90,4],[91,5],[92,6],[93,7],[44,2],[47,8],[45,2],[46,2],[94,9],[95,10],[96,11],[97,12],[98,13],[99,14],[100,14],[102,15],[101,16],[103,17],[104,18],[105,19],[87,20],[106,21],[107,22],[108,23],[109,24],[110,25],[111,26],[112,27],[113,28],[114,29],[115,30],[116,31],[117,32],[118,33],[119,33],[120,34],[121,2],[122,2],[123,35],[125,36],[124,37],[126,38],[127,39],[128,40],[129,41],[130,42],[131,43],[132,44],[49,45],[48,2],[141,46],[133,47],[134,48],[135,49],[136,50],[137,51],[138,52],[139,53],[140,54],[40,2],[65,55],[75,56],[64,55],[85,57],[56,58],[55,59],[84,60],[78,61],[83,62],[58,63],[72,64],[57,65],[81,66],[53,67],[52,60],[82,68],[54,69],[59,70],[60,2],[63,70],[50,2],[86,71],[76,72],[67,73],[68,74],[70,75],[66,76],[69,77],[79,60],[61,78],[62,79],[71,80],[51,81],[74,72],[73,70],[77,2],[80,82],[39,81],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[4,2],[22,2],[19,2],[20,2],[21,2],[23,2],[24,2],[25,2],[5,2],[26,2],[27,2],[28,2],[29,2],[6,2],[30,2],[31,2],[32,2],[33,2],[7,2],[38,2],[34,2],[35,2],[36,2],[37,2],[1,2]]},"version":"4.5.4"} \ No newline at end of file From 28b967d63503d976bbca119c3cecb31db649dd72 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 02:59:40 -0700 Subject: [PATCH 090/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 4efaed163..65ee9a5c8 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -80,7 +80,7 @@ jobs: - name: Get new version id: get-new-version run: | - echo new_version=$(node bump-dev-num.js) >> $GITHUB_OUTPUT + echo new_version=$(node bump-dev-num.js ${{ steps.get-current-version.outputs.current_version }}) >> $GITHUB_OUTPUT echo "new_version=$new_version" >> $GITHUB_OUTPUT working-directory: .github/workflows From cb5b13f75cc4d1b636f2ad7b9b3ee0018cb2367a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:04:14 -0700 Subject: [PATCH 091/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 65ee9a5c8..2751cc485 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -80,7 +80,7 @@ jobs: - name: Get new version id: get-new-version run: | - echo new_version=$(node bump-dev-num.js ${{ steps.get-current-version.outputs.current_version }}) >> $GITHUB_OUTPUT + echo new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} ) >> $GITHUB_OUTPUT echo "new_version=$new_version" >> $GITHUB_OUTPUT working-directory: .github/workflows From 9cab8f3ca8aab38f400ccca20d505ec1ee495f12 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:09:15 -0700 Subject: [PATCH 092/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- .github/workflows/bump-version.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 89a6e0f6c..cd6f183bc 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -267,7 +267,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 #slow --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 2751cc485..b299df9ee 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -81,7 +81,7 @@ jobs: id: get-new-version run: | echo new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} ) >> $GITHUB_OUTPUT - echo "new_version=$new_version" >> $GITHUB_OUTPUT + echo "new_version=$new_version" working-directory: .github/workflows #- name: Print new version From f06103d831dbba4ca684c5bdc3035474b3230ed6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:38:44 -0700 Subject: [PATCH 093/417] CI/CD Improvements --- .github/workflows/bump-dev-num.js | 31 +++++++++++++++++++++--------- .github/workflows/bump-version.yml | 4 ++-- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/bump-dev-num.js b/.github/workflows/bump-dev-num.js index 7e5555418..41ffb3a3b 100644 --- a/.github/workflows/bump-dev-num.js +++ b/.github/workflows/bump-dev-num.js @@ -1,25 +1,38 @@ const semver = require('semver') const versionString = process.argv[2] +const promote = process.argv[3] + const version = semver.parse(versionString) if (!version) { console.error('Invalid version string') process.exit(1) } - +console.log(version) if (version.prerelease.includes('dev')) { // Increment the dev release number - version.inc('prerelease', 'dev') + if(promote){ + version.prerelease = ['rc', 1]; // Transition to rc with the first RC number + } + else { + version.inc('prerelease', 'dev') + + } } else if (version.prerelease.includes('rc')) { // Increment the RC number - version.inc('prerelease', 'rc') - version.prerelease[1] = 1 // Ensure dev number starts at 1 + if(promote){ + version.prerelease = [] + version.inc('patch') // Bump to next minor version + + } + else { + version.inc('prerelease', 'rc') + + } } else { - // Assume this is a release version - version.inc('minor') // Bump to next minor version - version.prerelease = ['rc', 1] // Start RC numbers from 1 - version.format() // Apply changes + // Create the first dev pre-release + version.prerelease = ['dev', 1]; // Transition to rc with the first RC number } -console.log(version.version) +console.log(version.format()) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index b299df9ee..b43466048 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -80,8 +80,8 @@ jobs: - name: Get new version id: get-new-version run: | - echo new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} ) >> $GITHUB_OUTPUT - echo "new_version=$new_version" + echo new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} false) >> $GITHUB_OUTPUT + echo "new_version=${{new_version}}" working-directory: .github/workflows #- name: Print new version From 9bf17b7cc0c9de94cbf75028a8912d5f3add4aaa Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:43:07 -0700 Subject: [PATCH 094/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 2 +- .github/workflows/dev-workflow-p2.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index b43466048..4bd27a3cf 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -81,7 +81,7 @@ jobs: id: get-new-version run: | echo new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} false) >> $GITHUB_OUTPUT - echo "new_version=${{new_version}}" + echo "new_version=${{ steps.get-new-version.outputs.new_version }}" working-directory: .github/workflows #- name: Print new version diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 51684cf24..8fdca9b9d 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -8,12 +8,12 @@ on: - 'dev*' jobs: - bump-dev-number: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit +# bump-dev-number: +# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number From e985bf1b9aea5ca57d3b9d104b3e802256bf0cb1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:44:23 -0700 Subject: [PATCH 095/417] CI/CD Improvements --- .github/workflows/dev-workflow-p1.yml | 14 +++++++------- .github/workflows/dev-workflow-p2.yml | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 8e90900c7..696c3853f 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -26,13 +26,13 @@ on: type: boolean default: false -jobs: - test-with-server-release: - uses: ./.github/workflows/build-artifacts.yml - with: - run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} - sha-to-build-and-test: ${{ github.sha }} - secrets: inherit +#jobs: +# test-with-server-release: +# uses: ./.github/workflows/build-artifacts.yml +# with: +# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} +# sha-to-build-and-test: ${{ github.sha }} +# secrets: inherit # test-with-server-rc: # needs: test-with-server-release diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 8fdca9b9d..51684cf24 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -8,12 +8,12 @@ on: - 'dev*' jobs: -# bump-dev-number: -# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} -# uses: ./.github/workflows/bump-version.yml -# with: -# change: 'bump-dev-num' -# secrets: inherit + bump-dev-number: + #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + uses: ./.github/workflows/bump-version.yml + with: + change: 'bump-dev-num' + secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number From 7454ffc5363460e812291c6c75036818a3b2374c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:48:37 -0700 Subject: [PATCH 096/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 4bd27a3cf..d5f31c936 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -80,12 +80,11 @@ jobs: - name: Get new version id: get-new-version run: | - echo new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} false) >> $GITHUB_OUTPUT - echo "new_version=${{ steps.get-new-version.outputs.new_version }}" + echo "new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} false)"" >> $GITHUB_OUTPUT working-directory: .github/workflows - #- name: Print new version - # run: echo "New version is: ${{ steps.get-current-version.outputs.new_version }}" + - name: Print new version + run: echo "New version is: ${{ steps.get-new-version.outputs.new_version }}" update-version-in-repo: From db4659e2385fa51d58427d9af29e6a0e6a9c4c47 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:50:04 -0700 Subject: [PATCH 097/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index d5f31c936..2430324a5 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -80,7 +80,7 @@ jobs: - name: Get new version id: get-new-version run: | - echo "new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} false)"" >> $GITHUB_OUTPUT + echo "new_version=$(node bump-dev-num.js ${{ needs.get-current-version.outputs.current_version }} false)" >> $GITHUB_OUTPUT working-directory: .github/workflows - name: Print new version From 75bc11c3a7cb79ab7f7c13934cca245c1a68cc08 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:52:09 -0700 Subject: [PATCH 098/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 2430324a5..eac9ccbca 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -84,7 +84,8 @@ jobs: working-directory: .github/workflows - name: Print new version - run: echo "New version is: ${{ steps.get-new-version.outputs.new_version }}" + run: | + echo "New version is ${{ steps.get-new-version.outputs.new_version }}" update-version-in-repo: From 381dca18f445f85402469dfd4f31888683a2676d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:54:33 -0700 Subject: [PATCH 099/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index eac9ccbca..9e42b7c3e 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -85,7 +85,7 @@ jobs: - name: Print new version run: | - echo "New version is ${{ steps.get-new-version.outputs.new_version }}" + echo "New version is ${{ steps.get-new-version.outputs.new_version }}" >> $GITHUB_OUTPUT update-version-in-repo: From aa9f0813598a0967b21e3ad8fb0bd7c1308aa1b3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 03:59:29 -0700 Subject: [PATCH 100/417] CI/CD Improvements --- .github/workflows/bump-dev-num.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-dev-num.js b/.github/workflows/bump-dev-num.js index 41ffb3a3b..03f863818 100644 --- a/.github/workflows/bump-dev-num.js +++ b/.github/workflows/bump-dev-num.js @@ -9,7 +9,7 @@ if (!version) { console.error('Invalid version string') process.exit(1) } -console.log(version) + if (version.prerelease.includes('dev')) { // Increment the dev release number if(promote){ From 6cfe9854d9368ca8b5e440f475d851c9c71e1394 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 04:13:34 -0700 Subject: [PATCH 101/417] CI/CD Improvements --- .github/workflows/bump-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 9e42b7c3e..d274c7eb6 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -85,7 +85,7 @@ jobs: - name: Print new version run: | - echo "New version is ${{ steps.get-new-version.outputs.new_version }}" >> $GITHUB_OUTPUT + echo "${{ steps.get-new-version.outputs.new_version }}" update-version-in-repo: From 083f624c6553285ada222fd4e1427da17ab7195c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 23:31:19 -0700 Subject: [PATCH 102/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 51684cf24..5ebd95101 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -2,10 +2,11 @@ name: Dev workflow (part 2) on: pull_request: - types: - - synchronize branches: - 'dev*' + types: + -closed + workflow_dispatch: jobs: bump-dev-number: From 076137ccc3507850e90028f85b7f7c501c628713 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 23:36:25 -0700 Subject: [PATCH 103/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 5ebd95101..3ef52772b 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -1,11 +1,11 @@ name: Dev workflow (part 2) on: - pull_request: + pull_request_target: branches: - - 'dev*' + - 'dev*' types: - -closed + - closed workflow_dispatch: jobs: From 75ce5605e167e33b9b4c231e0048ea03dad77331 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 23:45:13 -0700 Subject: [PATCH 104/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 4 ++++ .github/workflows/update-version.yml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 3ef52772b..df2ce562e 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -6,7 +6,11 @@ on: - 'dev*' types: - closed + paths-ignore: + - 'package.json' workflow_dispatch: + paths-ignore: + - 'package.json' jobs: bump-dev-number: diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index ce155ed1e..619bd2535 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -57,7 +57,8 @@ jobs: commit_message: 'Auto-bump version to ${{ inputs.new_version }} [skip ci]' commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> tagging_message: ${{ inputs.new_version }} - branch: ${{ inputs.is_workflow_call && inputs.ref || github.ref }} + branch: refs/heads/2024-Pipeline-Improvement + #branch: ${{ inputs.is_workflow_call && inputs.ref || github.ref }} - name: Output bump commit hash for next jobs to use id: get-bump-commit-sha From 4d766ab09b3b1cb36ed718af59868621f8c13b75 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 23:46:34 -0700 Subject: [PATCH 105/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index df2ce562e..002d3c347 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -5,7 +5,7 @@ on: branches: - 'dev*' types: - - closed + - synchronize paths-ignore: - 'package.json' workflow_dispatch: From 1cde38f3cbaf97f57d2639877c79d33ee2579eef Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 23:47:23 -0700 Subject: [PATCH 106/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 002d3c347..6a18e3c39 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -1,7 +1,7 @@ name: Dev workflow (part 2) on: - pull_request_target: + pull_request: branches: - 'dev*' types: From e81079b765098b7bcd930008c6ba0678a940a8e2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Tue, 7 Jan 2025 23:52:16 -0700 Subject: [PATCH 107/417] CI/CD Improvements --- .github/workflows/update-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 619bd2535..8dc0eaf4c 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -57,7 +57,7 @@ jobs: commit_message: 'Auto-bump version to ${{ inputs.new_version }} [skip ci]' commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> tagging_message: ${{ inputs.new_version }} - branch: refs/heads/2024-Pipeline-Improvement + branch: 2024-Pipeline-Improvement #branch: ${{ inputs.is_workflow_call && inputs.ref || github.ref }} - name: Output bump commit hash for next jobs to use From 3b5f10796e289f331692e5253d889cae7dd6fe73 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 09:12:23 -0700 Subject: [PATCH 108/417] CI/CD Improvements --- .github/workflows/dev-workflow-p1.yml | 14 +++++++------- .github/workflows/dev-workflow-p2.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 696c3853f..8e90900c7 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -26,13 +26,13 @@ on: type: boolean default: false -#jobs: -# test-with-server-release: -# uses: ./.github/workflows/build-artifacts.yml -# with: -# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} -# sha-to-build-and-test: ${{ github.sha }} -# secrets: inherit +jobs: + test-with-server-release: + uses: ./.github/workflows/build-artifacts.yml + with: + run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} + sha-to-build-and-test: ${{ github.sha }} + secrets: inherit # test-with-server-rc: # needs: test-with-server-release diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 6a18e3c39..8b6046757 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -12,13 +12,13 @@ on: paths-ignore: - 'package.json' -jobs: - bump-dev-number: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit +#jobs: +# bump-dev-number: +# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number From 19c95b0c9d07f5f86f1d595b9b3f901cd9030585 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 09:17:55 -0700 Subject: [PATCH 109/417] CI/CD Improvements --- .github/workflows/build-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index e306fc296..8fe9a8d24 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -88,8 +88,8 @@ jobs: "manylinux_x86_64", #"manylinux_aarch64", "macosx_x86_64", - #"macosx_arm64", - #"win_amd64" + "macosx_arm64", + "win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml From 04e01cea586e7d37b9ad2e75260642324c2906d2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 09:30:31 -0700 Subject: [PATCH 110/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index cd6f183bc..f6a82cdc9 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -36,8 +36,8 @@ on: - manylinux_x86_64 #- manylinux_aarch64 - macosx_x86_64 - #- macosx_arm64 - #- win_amd64 + - macosx_arm64 + - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: @@ -291,20 +291,34 @@ jobs: run: | ls ./lib/binding; - - name: Upload wheels to GitHub Linux + - name: Upload wheels to GitHub Linux x86 uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'manylinux_x86_64' }} with: path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - - name: Upload wheels to GitHub Mac + - name: Upload wheels to GitHub Mac x86 uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'macosx_x86_64' }} with: path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node + - name: Upload wheels to GitHub Mac Arm + uses: actions/upload-artifact@v4 + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + with: + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-arm64/aerospike.node + name: ${{ env.BUILD_IDENTIFIER }}.node + + - name: Upload wheels to GitHub Windows + uses: actions/upload-artifact@v4 + if: ${{ inputs.platform-tag == 'win_amd64' }} + with: + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/aerospike.node + name: ${{ env.BUILD_IDENTIFIER }}.node + - name: Set final commit status uses: myrotvorets/set-commit-status-action@v2.0.0 if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} From 1f67f0266caa83443bcbcbfc7bf7c2e5970ef2f9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 09:53:07 -0700 Subject: [PATCH 111/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 4 ++-- ts-test/tests/batch_read.ts | 14 +++++++------- ts-test/tests/batch_write.ts | 2 +- ts-test/tests/get.ts | 12 ++++++------ ts-test/tests/query.ts | 3 +-- ts-test/tests/scan.ts | 5 ++--- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index f6a82cdc9..7bed20263 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -267,7 +267,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} #slow -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel @@ -381,7 +381,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEJS_VERSION }} + node-version: ${{ matrix.nodejs-tag[1] }} - name: Install wheel run: | diff --git a/ts-test/tests/batch_read.ts b/ts-test/tests/batch_read.ts index 56ce1d283..f1a633ecb 100644 --- a/ts-test/tests/batch_read.ts +++ b/ts-test/tests/batch_read.ts @@ -204,7 +204,7 @@ describe('client.batchRead()', function () { const batchResult = await client.batchRead(batch, policy) expect(batchResult[0].record.bins).to.eql({ i: 2 }) - expect(batchResult[0].record.ttl).to.be.within(6, 8) + expect(batchResult[0].record.ttl).to.be.within(5, 8) const record = await client.get(new Aerospike.Key('test', 'demo', 'batchTtl1')) expect(record.bins).to.eql({ i: 2 }) @@ -228,7 +228,7 @@ describe('client.batchRead()', function () { const batchResult = await client.batchRead(batch, policy) expect(batchResult[0].record.bins).to.eql({ i: 2 }) - expect(batchResult[0].record.ttl).to.be.within(6, 8) + expect(batchResult[0].record.ttl).to.be.within(5, 8) const record = await client.get(new Aerospike.Key('test', 'demo', 'batchTtl2')) expect(record.bins).to.eql({ i: 2 }) @@ -276,7 +276,7 @@ describe('client.batchRead()', function () { const batchResult = await client.batchRead(batch, policy) expect(batchResult[0].record.bins).to.eql({ i: 2 }) - expect(batchResult[0].record.ttl).to.be.within(6, 8) + expect(batchResult[0].record.ttl).to.be.within(5, 8) const record = await client.get(new Aerospike.Key('test', 'demo', 'batchTtl4')) expect(record.bins).to.eql({ i: 2 }) @@ -301,7 +301,7 @@ describe('client.batchRead()', function () { const batchResult = await client.batchRead(batch) expect(batchResult[0].record.bins).to.eql({ i: 2 }) - expect(batchResult[0].record.ttl).to.be.within(6, 8) + expect(batchResult[0].record.ttl).to.be.within(5, 8) const record = await client.get(new Aerospike.Key('test', 'demo', 'batchReadTtl1')) expect(record.bins).to.eql({ i: 2 }) @@ -323,7 +323,7 @@ describe('client.batchRead()', function () { const batchResult: BatchResult[] = await client.batchRead(batch) expect(batchResult[0].record.bins).to.eql({ i: 2 }) - expect(batchResult[0].record.ttl).to.be.within(6, 8) + expect(batchResult[0].record.ttl).to.be.within(5, 8) const record = await client.get(new Aerospike.Key('test', 'demo', 'batchReadTtl2')) expect(record.bins).to.eql({ i: 2 }) @@ -345,7 +345,7 @@ describe('client.batchRead()', function () { const batchResult: BatchResult[] = await client.batchRead(batch) expect(batchResult[0].record.bins).to.eql({ i: 2 }) - expect(batchResult[0].record.ttl).to.be.within(6, 8) + expect(batchResult[0].record.ttl).to.be.within(5, 8) const record: AerospikeRecord = await client.get(new Aerospike.Key('test', 'demo', 'batchReadTtl3')) expect(record.bins).to.eql({ i: 2 }) @@ -367,7 +367,7 @@ describe('client.batchRead()', function () { const batchResult: BatchResult[] = await client.batchRead(batch) expect(batchResult[0].record.bins).to.eql({ i: 2 }) - expect(batchResult[0].record.ttl).to.be.within(6, 8) + expect(batchResult[0].record.ttl).to.be.within(5, 8) const record: AerospikeRecord = await client.get(new Aerospike.Key('test', 'demo', 'batchReadTtl4')) expect(record.bins).to.eql({ i: 2 }) diff --git a/ts-test/tests/batch_write.ts b/ts-test/tests/batch_write.ts index e0864637e..2cea5e645 100644 --- a/ts-test/tests/batch_write.ts +++ b/ts-test/tests/batch_write.ts @@ -570,7 +570,7 @@ describe('client.batchWrite()', function () { const bins = result.bins expect(bins.example).to.be.a('number') expect(bins.blob).to.be.a('array') - expect(result.ttl).to.equal(1367) + expect(result.ttl).to.be.within(1366, 1367) }) }) }) diff --git a/ts-test/tests/get.ts b/ts-test/tests/get.ts index 16364c92b..7a8eeec86 100644 --- a/ts-test/tests/get.ts +++ b/ts-test/tests/get.ts @@ -100,7 +100,7 @@ describe('client.get()', function () { let record: AerospikeRecord = await client.get(key, policy) expect(record.bins).to.eql({ i: 2 }) - expect(record.ttl).to.be.within(6, 8) + expect(record.ttl).to.be.within(5, 8) record = await client.get(key, policy) @@ -121,7 +121,7 @@ describe('client.get()', function () { let record: AerospikeRecord = await client.get(key, policy) expect(record.bins).to.eql({ i: 2 }) - expect(record.ttl).to.be.within(6, 8) + expect(record.ttl).to.be.within(5, 8) record = await client.get(key, policy) @@ -142,12 +142,12 @@ describe('client.get()', function () { let record: AerospikeRecord = await client.get(key, policy) expect(record.bins).to.eql({ i: 2 }) - expect(record.ttl).to.be.within(6, 8) + expect(record.ttl).to.be.within(5, 8) record = await client.get(key, policy) expect(record.bins).to.eql({ i: 2 }) - expect(record.ttl).to.be.within(6, 8) + expect(record.ttl).to.be.within(5, 8) await client.remove(key) }) @@ -162,12 +162,12 @@ describe('client.get()', function () { let record: AerospikeRecord = await client.get(key, policy) expect(record.bins).to.eql({ i: 2 }) - expect(record.ttl).to.be.within(6, 8) + expect(record.ttl).to.be.within(5, 8) record = await client.get(key, policy) expect(record.bins).to.eql({ i: 2 }) - expect(record.ttl).to.be.within(6, 8) + expect(record.ttl).to.be.within(5, 8) await client.remove(key) }) }) diff --git a/ts-test/tests/query.ts b/ts-test/tests/query.ts index a30e2b86e..c7d5719a0 100644 --- a/ts-test/tests/query.ts +++ b/ts-test/tests/query.ts @@ -1129,8 +1129,7 @@ describe('Queries', function () { const key = keys[Math.floor(Math.random() * keys.length)] const record = await client.get(key) - expect(record.ttl).to.equal(3599) - expect(record.ttl).to.be.within(3599, 3600) + expect(record.ttl).to.be.within(3598, 3600) }) diff --git a/ts-test/tests/scan.ts b/ts-test/tests/scan.ts index 45722e999..a55cd2d69 100644 --- a/ts-test/tests/scan.ts +++ b/ts-test/tests/scan.ts @@ -409,8 +409,7 @@ context('Scans', function () { const key: any = keys[Math.floor(Math.random() * keys.length)] const record = await client.get(key) - expect(record.ttl).to.equal(14399) - expect(record.ttl).to.be.within(14399, 14400) + expect(record.ttl).to.be.within(14398, 14400) }) @@ -423,7 +422,7 @@ context('Scans', function () { const key: any = keys[Math.floor(Math.random() * keys.length)] const record = await client.get(key) console.log('After scan-op TTL : %d Key TTL: %d', ttl, record.ttl) - expect(record.ttl).to.be.within(ttl - 1, ttl) + expect(record.ttl).to.be.within(ttl - 2, ttl) }) }) From 3d336f6fe80978ce8fd135968af98e8b8c09f131 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 10:11:02 -0700 Subject: [PATCH 112/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7bed20263..98d9b1d43 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -383,6 +383,60 @@ jobs: with: node-version: ${{ matrix.nodejs-tag[1] }} + - name: Install nvm + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash + source ~/.zshrc + source ~/.bashrc + nvm -v + shell: bash + + - name: Install Node.js 20 + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + nvm i 20 + shell: bash + + - name: Prepare /usr/local/opt directory + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + sudo rm -rf /usr/local/opt + sudo mkdir -p /usr/local/opt + sudo chown -R $(whoami) /usr/local/opt + shell: bash + + - name: Install libuv + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + brew install libuv + sudo ln -s /opt/homebrew/opt/libuv/1.45.0/ /usr/local/opt/libuv + shell: bash + + - name: Configure OpenSSL + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + rm -rf /usr/local/opt/openssl + sudo ln -s /opt/homebrew/opt/openssl@3.4/ /usr/local/opt/openssl + shell: bash + + - name: Update PATH and environment variables + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + echo "export PATH=\"/usr/local/bin/:/usr/local/opt/openssl/bin:\$PATH\"" >> ~/.zshrc + echo "export LDFLAGS=\"-L/usr/local/opt/openssl/lib\"" >> ~/.zshrc + echo "export CPPFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zshrc + echo "export EXT_CFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zshrc + shell: bash + + - name: Source updated environment variables + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + source ~/.zshrc + shell: bash + + + - name: Install wheel run: | ./scripts/build-c-client.sh From b1aef4d1e647e5d1a7fca8c8e8c2c19905815223 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 10:14:06 -0700 Subject: [PATCH 113/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 98d9b1d43..163165eac 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -438,11 +438,19 @@ jobs: - name: Install wheel + if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | ./scripts/build-c-client.sh npm install shell: bash + - name: Install wheel + if: ${{ inputs.platform-tag == 'win_amd64' }} + run: | + ./scripts/build-c-client.ps1 + npm install + shell: powershell + - name: Connect to Docker container on remote machine with Docker daemon if: ${{ inputs.platform-tag == 'win_amd64' }} # DOCKER_HOST contains the IP address of the remote machine From 7360e82a6376ef4f52ab174599ddffe5346967e8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 10:19:46 -0700 Subject: [PATCH 114/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 163165eac..ac4c00768 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -387,8 +387,8 @@ jobs: if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash + touch ~/.zshrc source ~/.zshrc - source ~/.bashrc nvm -v shell: bash From e4cb99b83147bfa701ede34f254c1fbca969b96b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 10:25:37 -0700 Subject: [PATCH 115/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index ac4c00768..9ec0a9b50 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -387,8 +387,8 @@ jobs: if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash - touch ~/.zshrc - source ~/.zshrc + touch ~/.zprofile + source ~/.zprofile nvm -v shell: bash @@ -432,7 +432,7 @@ jobs: - name: Source updated environment variables if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | - source ~/.zshrc + source ~/.zprofile shell: bash From 8df9d25d117674262e0ff069855b9a366dee541a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 10:33:23 -0700 Subject: [PATCH 116/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 9ec0a9b50..bc7a69e5c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -392,11 +392,11 @@ jobs: nvm -v shell: bash - - name: Install Node.js 20 - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - nvm i 20 - shell: bash + #- name: Install Node.js 20 + # if: ${{ inputs.platform-tag == 'macosx_arm64' }} + # run: | + # nvm i 20 + # shell: bash - name: Prepare /usr/local/opt directory if: ${{ inputs.platform-tag == 'macosx_arm64' }} From ea96635fea49b1796bed58b8fd2ee610956ade24 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 10:57:49 -0700 Subject: [PATCH 117/417] CI/CD Improvements --- .github/workflows/build-artifacts.yml | 6 +++--- .github/workflows/build-bindings.yml | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 8fe9a8d24..457559621 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -85,11 +85,11 @@ jobs: strategy: matrix: platform-tag: [ - "manylinux_x86_64", + #"manylinux_x86_64", #"manylinux_aarch64", - "macosx_x86_64", + #"macosx_x86_64", "macosx_arm64", - "win_amd64" + #"win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index bc7a69e5c..3079efedd 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -33,11 +33,11 @@ on: type: choice required: true options: - - manylinux_x86_64 + #- manylinux_x86_64 #- manylinux_aarch64 - - macosx_x86_64 + #- macosx_x86_64 - macosx_arm64 - - win_amd64 + #- win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: @@ -386,7 +386,7 @@ jobs: - name: Install nvm if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash touch ~/.zprofile source ~/.zprofile nvm -v @@ -423,10 +423,10 @@ jobs: - name: Update PATH and environment variables if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | - echo "export PATH=\"/usr/local/bin/:/usr/local/opt/openssl/bin:\$PATH\"" >> ~/.zshrc - echo "export LDFLAGS=\"-L/usr/local/opt/openssl/lib\"" >> ~/.zshrc - echo "export CPPFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zshrc - echo "export EXT_CFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zshrc + echo "export PATH=\"/usr/local/bin/:/usr/local/opt/openssl/bin:\$PATH\"" >> ~/.zprofile + echo "export LDFLAGS=\"-L/usr/local/opt/openssl/lib\"" >> ~/.zprofile + echo "export CPPFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zprofile + echo "export EXT_CFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zprofile shell: bash - name: Source updated environment variables From d4924821a8df58fa75a34b8405223b071fdc4a51 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 16:44:31 -0700 Subject: [PATCH 118/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 8b6046757..6a18e3c39 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -12,13 +12,13 @@ on: paths-ignore: - 'package.json' -#jobs: -# bump-dev-number: -# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} -# uses: ./.github/workflows/bump-version.yml -# with: -# change: 'bump-dev-num' -# secrets: inherit +jobs: + bump-dev-number: + #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + uses: ./.github/workflows/bump-version.yml + with: + change: 'bump-dev-num' + secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number From 97929015abb79c20e793864a6f47f644f49c1277 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 16:56:15 -0700 Subject: [PATCH 119/417] CI/CD Improvements --- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/build-bindings.yml | 2 +- .github/workflows/dev-workflow-p2.yml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 457559621..fb5358337 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -89,7 +89,7 @@ jobs: #"manylinux_aarch64", #"macosx_x86_64", "macosx_arm64", - #"win_amd64" + "win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3079efedd..edb00782e 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -37,7 +37,7 @@ on: #- manylinux_aarch64 #- macosx_x86_64 - macosx_arm64 - #- win_amd64 + - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 6a18e3c39..8b6046757 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -12,13 +12,13 @@ on: paths-ignore: - 'package.json' -jobs: - bump-dev-number: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit +#jobs: +# bump-dev-number: +# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number From 3f407df275487ce07085e85fc6cae0f0d2109406 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 17:03:52 -0700 Subject: [PATCH 120/417] CI/CD Improvements --- .github/workflows/dev-workflow-p2.yml | 14 +++++++------- .github/workflows/update-version.yml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 8b6046757..6a18e3c39 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -12,13 +12,13 @@ on: paths-ignore: - 'package.json' -#jobs: -# bump-dev-number: -# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} -# uses: ./.github/workflows/bump-version.yml -# with: -# change: 'bump-dev-num' -# secrets: inherit +jobs: + bump-dev-number: + #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + uses: ./.github/workflows/bump-version.yml + with: + change: 'bump-dev-num' + secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml index 8dc0eaf4c..b8a3aecca 100644 --- a/.github/workflows/update-version.yml +++ b/.github/workflows/update-version.yml @@ -41,6 +41,7 @@ jobs: outputs: bump_sha: ${{ steps.get-bump-commit-sha.outputs.bump_sha }} steps: + - uses: actions/checkout@v4 with: token: ${{ secrets.CLIENT_BOT_PAT }} From 73f2d866cda666f8f16efe40363d533b7b2f74a8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 17:17:21 -0700 Subject: [PATCH 121/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index edb00782e..2009e27f6 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -437,19 +437,19 @@ jobs: - - name: Install wheel - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - ./scripts/build-c-client.sh - npm install - shell: bash - - - name: Install wheel - if: ${{ inputs.platform-tag == 'win_amd64' }} - run: | - ./scripts/build-c-client.ps1 - npm install - shell: powershell +# - name: Install wheel +# if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# run: | +# ./scripts/build-c-client.sh +# npm install +# shell: bash + +# - name: Install wheel +# if: ${{ inputs.platform-tag == 'win_amd64' }} +# run: | +# ./scripts/build-c-client.ps1 +# npm install +# shell: powershell - name: Connect to Docker container on remote machine with Docker daemon if: ${{ inputs.platform-tag == 'win_amd64' }} From 2f037b0cc769018d758f7d6e4e31a77982f2ea38 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 17:28:09 -0700 Subject: [PATCH 122/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 109 ++++++++++++++------------- 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2009e27f6..6f0b6cd1f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -380,62 +380,69 @@ jobs: shell: bash - uses: actions/setup-node@v4 + if: ${{ inputs.platform-tag == 'macosx_arm64' }} with: node-version: ${{ matrix.nodejs-tag[1] }} + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-arm64/ - - name: Install nvm - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash - touch ~/.zprofile - source ~/.zprofile - nvm -v - shell: bash - - #- name: Install Node.js 20 - # if: ${{ inputs.platform-tag == 'macosx_arm64' }} - # run: | - # nvm i 20 - # shell: bash - - - name: Prepare /usr/local/opt directory - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - sudo rm -rf /usr/local/opt - sudo mkdir -p /usr/local/opt - sudo chown -R $(whoami) /usr/local/opt - shell: bash - - - name: Install libuv - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - brew install libuv - sudo ln -s /opt/homebrew/opt/libuv/1.45.0/ /usr/local/opt/libuv - shell: bash - - - name: Configure OpenSSL - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - rm -rf /usr/local/opt/openssl - sudo ln -s /opt/homebrew/opt/openssl@3.4/ /usr/local/opt/openssl - shell: bash - - - name: Update PATH and environment variables - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - echo "export PATH=\"/usr/local/bin/:/usr/local/opt/openssl/bin:\$PATH\"" >> ~/.zprofile - echo "export LDFLAGS=\"-L/usr/local/opt/openssl/lib\"" >> ~/.zprofile - echo "export CPPFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zprofile - echo "export EXT_CFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zprofile - shell: bash - - - name: Source updated environment variables - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - source ~/.zprofile - shell: bash + - uses: actions/setup-node@v4 + if: ${{ inputs.platform-tag == 'win_amd64' }} + with: + node-version: ${{ matrix.nodejs-tag[1] }} + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/ +# - name: Install nvm +# if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# run: | +# curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash +# touch ~/.zprofile +# source ~/.zprofile +# nvm -v +# shell: bash +# +# #- name: Install Node.js 20 +# # if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# # run: | +# # nvm i 20 +# # shell: bash +# +# - name: Prepare /usr/local/opt directory +# if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# run: | +# sudo rm -rf /usr/local/opt +# sudo mkdir -p /usr/local/opt +# sudo chown -R $(whoami) /usr/local/opt +# shell: bash +# +# - name: Install libuv +# if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# run: | +# brew install libuv +# sudo ln -s /opt/homebrew/opt/libuv/1.45.0/ /usr/local/opt/libuv +# shell: bash +# +# - name: Configure OpenSSL +# if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# run: | +# rm -rf /usr/local/opt/openssl +# sudo ln -s /opt/homebrew/opt/openssl@3.4/ /usr/local/opt/openssl +# shell: bash +# +# - name: Update PATH and environment variables +# if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# run: | +# echo "export PATH=\"/usr/local/bin/:/usr/local/opt/openssl/bin:\$PATH\"" >> ~/.zprofile +# echo "export LDFLAGS=\"-L/usr/local/opt/openssl/lib\"" >> ~/.zprofile +# echo "export CPPFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zprofile +# echo "export EXT_CFLAGS=\"-I/usr/local/opt/openssl/include\"" >> ~/.zprofile +# shell: bash +# +# - name: Source updated environment variables +# if: ${{ inputs.platform-tag == 'macosx_arm64' }} +# run: | +# source ~/.zprofile +# shell: bash # - name: Install wheel # if: ${{ inputs.platform-tag == 'macosx_arm64' }} From ea81fd13aa1a7adf89a230b043d4940d764ecf41 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 17:38:38 -0700 Subject: [PATCH 123/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 6f0b6cd1f..fe5e7462c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -468,9 +468,7 @@ jobs: # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - run: | - npm install typescript --save-dev; npx tsc; - working-directory: ts-test shell: bash From aee76bac85b437b98a6fdb9500fcd33e85973fe9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 17:52:38 -0700 Subject: [PATCH 124/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index fe5e7462c..3788a073d 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -464,17 +464,14 @@ jobs: run: | $env:DOCKER_HOST_IP = $env:DOCKER_HOST | foreach {$_.replace("tcp://","")} | foreach {$_.replace(":2375", "")} crudini --set config.conf enterprise-edition hosts ${env:DOCKER_HOST_IP}:3000 - working-directory: ./github/workflows + working-directory: .\github\workflows # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - run: | - npx tsc; + tsc; working-directory: ts-test shell: bash - - run: npx tsc - shell: bash - - run: npm run test dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000 shell: bash From 066ba97b8b94f26731ca20694eb509718778b494 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 18:51:21 -0700 Subject: [PATCH 125/417] CI/CD Improvements --- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/build-bindings.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index fb5358337..621638c86 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -88,7 +88,7 @@ jobs: #"manylinux_x86_64", #"manylinux_aarch64", #"macosx_x86_64", - "macosx_arm64", + #"macosx_arm64", "win_amd64" ] fail-fast: false diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3788a073d..001656dc2 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -36,7 +36,7 @@ on: #- manylinux_x86_64 #- manylinux_aarch64 #- macosx_x86_64 - - macosx_arm64 + #- macosx_arm64 - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 @@ -464,7 +464,7 @@ jobs: run: | $env:DOCKER_HOST_IP = $env:DOCKER_HOST | foreach {$_.replace("tcp://","")} | foreach {$_.replace(":2375", "")} crudini --set config.conf enterprise-edition hosts ${env:DOCKER_HOST_IP}:3000 - working-directory: .\github\workflows + working-directory: github\workflows # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - run: | From c59461a4aa493d0d2ffaea67aa00403478faaac7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 19:10:32 -0700 Subject: [PATCH 126/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 97 +++++++++++++------ .github/workflows/release-package.yml | 46 +++++++++ 2 files changed, 113 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/release-package.yml diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index b857a489e..a20cb0c18 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -11,34 +11,41 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Create multiple directories run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ + # MAC X86 + - uses: actions/download-artifact@v4 + with: + name: v108-macosx_x86_64.node + path: ./lib/binding/node-v108-darwin-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-macosx_x86_64.node + path: ./lib/binding/node-v115-darwin-x64/ + - uses: actions/download-artifact@v4 + with: + name: v127-macosx_x86_64.node + path: ./lib/binding/node-v127-darwin-x64/ - # - uses: actions/download-artifact@v4 - # with: - # name: v108-macosx_aarch64.build + - uses: actions/download-artifact@v4 + with: + name: v131-macosx_x86_64.node + path: ./lib/binding/node-v131-darwin-x64/ + # MAC ARM - uses: actions/download-artifact@v4 with: name: v108-macosx_x86_64.node path: ./lib/binding/node-v108-darwin-arm64/ - # - uses: actions/download-artifact@v4 - # with: - # name: v115-macosx_aarch64.build - - uses: actions/download-artifact@v4 with: name: v115-macosx_x86_64.node path: ./lib/binding/node-v115-darwin-arm64/ - # - uses: actions/download-artifact@v4 - # with: - # name: v127-macosx_aarch64.build - - uses: actions/download-artifact@v4 with: name: v127-macosx_x86_64.node @@ -49,41 +56,71 @@ jobs: name: v131-macosx_x86_64.node path: ./lib/binding/node-v131-darwin-arm64/ + # Linux X86 - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v108-linux-arm64/ - - # - uses: actions/download-artifact@v4 - # with: - # name: v108-manylinux_aarch64.build + path: ./lib/binding/glibc@2.31/node-v108-linux-x64/ - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v115-linux-arm64/ + path: ./lib/binding/glibc@2.31/node-v115-linux-x64/ - # - uses: actions/download-artifact@v4 - # with: - # name: v115-manylinux_aarch64.build - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v127-linux-arm64/ - - # - uses: actions/download-artifact@v4 - # with: - # name: v127-manylinux_aarch64.build + path: ./lib/binding/glibc@2.31/node-v127-linux-x64/ - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v131-linux-arm64/ + path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ + + ## Linux ARM + #- uses: actions/download-artifact@v4 + # with: + # name: v108-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.31/node-v108-linux-arm64/ + + #- uses: actions/download-artifact@v4 + # with: + # name: v115-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.31/node-v115-linux-arm64/ - # - uses: actions/download-artifact@v4 - # with: - # name: v131-manylinux_aarch64.build + + #- uses: actions/download-artifact@v4 + # with: + # name: v127-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.31/node-v127-linux-arm64/ + + #- uses: actions/download-artifact@v4 + # with: + # name: v131-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.31/node-v131-linux-arm64/ + + # Windows + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v108-win32-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v115-win32-x64/ + + + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v127-win32-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v131-win32-x64/ - name: Install client shell: bash diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml new file mode 100644 index 000000000..2a37b4581 --- /dev/null +++ b/.github/workflows/release-package.yml @@ -0,0 +1,46 @@ +name: Release workflow + +on: + workflow_dispatch: + paths-ignore: + - 'package.json' + +jobs: + bump-dev-number: + #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + uses: ./.github/workflows/bump-version.yml + with: + change: 'bump-dev-num' + secrets: inherit + + rebuild-artifacts-with-new-dev-num: + name: Rebuild artifacts + uses: ./.github/workflows/build-artifacts.yml + with: + # On pull_request_target, the bump version commit will be ignored + # So we must pass it manually to the workflow + run-tests: false; + sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} + secrets: inherit + + test-npm-install: + needs: rebuild-artifacts-with-new-dev-num + name: Test npm install command for npm package + uses: ./.github/workflows/npm-install-script-test.yml + +# upload-to-jfrog: +# name: Upload artifacts to JFrog +# needs: [ +# bump-dev-number, +# rebuild-artifacts-with-new-dev-num +# ] +# uses: ./.github/workflows/upload-to-jfrog.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit +# +# # We don't want the artifacts in JFrog to also exist in Github +# delete-artifacts: +# needs: upload-to-jfrog +# uses: ./.github/workflows/delete-artifacts.yml +# \ No newline at end of file From 3b7a57b209847d7f64a87ec86511fcb4b9cfe071 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 20:04:38 -0700 Subject: [PATCH 127/417] CI/CD Improvement --- .github/workflows/dev-workflow-p2.yml | 19 ++++++++++++------- .github/workflows/release-package.yml | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 6a18e3c39..943ad545f 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -12,13 +12,18 @@ on: paths-ignore: - 'package.json' -jobs: - bump-dev-number: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit +#jobs: +# bump-dev-number: +# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit + + release-package: + needs: rebuild-artifacts-with-new-dev-num + name: release npm package + uses: ./.github/workflows/release-package.yml # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index 2a37b4581..9991c4622 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -1,6 +1,7 @@ name: Release workflow on: + workflow_call: workflow_dispatch: paths-ignore: - 'package.json' From ffb2d5aedde4f56098c526895ccea97dd88221ce Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 20:07:17 -0700 Subject: [PATCH 128/417] CI/CD Improvement --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 943ad545f..9b565ee6c 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -12,7 +12,7 @@ on: paths-ignore: - 'package.json' -#jobs: +jobs: # bump-dev-number: # #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} # uses: ./.github/workflows/bump-version.yml From 23ac4ed8de77c54096a59764774949efd1f08e9d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 20:07:49 -0700 Subject: [PATCH 129/417] CI/CD Improvement --- .github/workflows/dev-workflow-p2.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 9b565ee6c..6e9cee623 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -21,7 +21,6 @@ jobs: # secrets: inherit release-package: - needs: rebuild-artifacts-with-new-dev-num name: release npm package uses: ./.github/workflows/release-package.yml From 6beb49a04d92cae942c85238199a468a3cfc69b3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 20:09:15 -0700 Subject: [PATCH 130/417] CI/CD Improvement --- .github/workflows/release-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index 9991c4622..aa4a2132b 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -20,7 +20,7 @@ jobs: with: # On pull_request_target, the bump version commit will be ignored # So we must pass it manually to the workflow - run-tests: false; + run-tests: false sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} secrets: inherit From 833c58a434124191018b41233b3afce888233738 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 20:10:25 -0700 Subject: [PATCH 131/417] CI/CD Improvement --- .github/workflows/release-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index aa4a2132b..7f375d269 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -20,7 +20,7 @@ jobs: with: # On pull_request_target, the bump version commit will be ignored # So we must pass it manually to the workflow - run-tests: false + run_tests: false sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} secrets: inherit From c51653e563f1df02ea26cf7b8d72dbe23fc78b2d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 20:11:35 -0700 Subject: [PATCH 132/417] CI/CD Improvement --- .github/workflows/dev-workflow-p2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 6e9cee623..ef4eec3c3 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -23,6 +23,7 @@ jobs: release-package: name: release npm package uses: ./.github/workflows/release-package.yml + secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number From 0ff00d353d2231511dea6da3902ff7aa6311635f Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 20:21:58 -0700 Subject: [PATCH 133/417] CI/CD Improvement --- .github/workflows/build-artifacts.yml | 8 ++++---- .github/workflows/build-bindings.yml | 8 ++++---- .github/workflows/dev-workflow-p1.yml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 621638c86..8a90cae06 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -85,10 +85,10 @@ jobs: strategy: matrix: platform-tag: [ - #"manylinux_x86_64", - #"manylinux_aarch64", - #"macosx_x86_64", - #"macosx_arm64", + "manylinux_x86_64", + "manylinux_aarch64", + "macosx_x86_64", + "macosx_arm64", "win_amd64" ] fail-fast: false diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 001656dc2..39353c8aa 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -33,10 +33,10 @@ on: type: choice required: true options: - #- manylinux_x86_64 - #- manylinux_aarch64 - #- macosx_x86_64 - #- macosx_arm64 + - manylinux_x86_64 + - manylinux_aarch64 + - macosx_x86_64 + - macosx_arm64 - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 8e90900c7..6d26a3bec 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -27,12 +27,12 @@ on: default: false jobs: - test-with-server-release: - uses: ./.github/workflows/build-artifacts.yml - with: - run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} - sha-to-build-and-test: ${{ github.sha }} - secrets: inherit +# test-with-server-release: +# uses: ./.github/workflows/build-artifacts.yml +# with: +# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} +# sha-to-build-and-test: ${{ github.sha }} +# secrets: inherit # test-with-server-rc: # needs: test-with-server-release From 8c8ea3c2418885a1719f692674bd5c9eb93c6374 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:09:12 -0700 Subject: [PATCH 134/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 39353c8aa..13c23f2a8 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,14 +144,15 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="aerospike_arm_runners_2" - hashmap[macosx_x86_64]="macos-12-large" - hashmap[macosx_arm64]="macos-14" + hashmap[manylinux_aarch64]="experimental-1" + hashmap[macosx_x86_64]="macos-13-large" + hashmap[macosx_arm64]="Aero-HDJNFJ60XR" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps shell: bash + cibuildbinding: needs: get-runner-os strategy: From eb8651fa9862065a03a945aa69f0451aebbc23e0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:13:58 -0700 Subject: [PATCH 135/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 13c23f2a8..194271d90 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,9 +144,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="experimental-1" + hashmap[manylinux_aarch64]="fromJSON('["self-hosted", "linux", "ARM64"]')" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="Aero-HDJNFJ60XR" + hashmap[macosx_arm64]="fromJSON('["self-hosted", "macOS", "ARM64"]')" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 718682766da0ec82d1f598a19b0e0726d0430560 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:14:56 -0700 Subject: [PATCH 136/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 194271d90..1252570ad 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -146,7 +146,7 @@ jobs: hashmap[manylinux_x86_64]="ubuntu-22.04" hashmap[manylinux_aarch64]="fromJSON('["self-hosted", "linux", "ARM64"]')" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="fromJSON('["self-hosted", "macOS", "ARM64"]')" + hashmap[macosx_arm64]=fromJSON('["self-hosted", "macOS", "ARM64"]') hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 8e3a9b71a98a3aec111d7e656d6d557ce9a664d2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:15:13 -0700 Subject: [PATCH 137/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 1252570ad..7b95597ec 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,7 +144,7 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="fromJSON('["self-hosted", "linux", "ARM64"]')" + hashmap[manylinux_aarch64]=fromJSON('["self-hosted", "linux", "ARM64"]') hashmap[macosx_x86_64]="macos-13-large" hashmap[macosx_arm64]=fromJSON('["self-hosted", "macOS", "ARM64"]') hashmap[win_amd64]="windows-2022" From 7ae0d26db826bef00fdbe20ae5945c8b31e10f93 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:25:56 -0700 Subject: [PATCH 138/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7b95597ec..60744fb79 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,9 +144,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]=fromJSON('["self-hosted", "linux", "ARM64"]') + hashmap[manylinux_aarch64]=["self-hosted", "macOS", "ARM64"] hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]=fromJSON('["self-hosted", "macOS", "ARM64"]') + hashmap[macosx_arm64]=["self-hosted", "macOS", "ARM64"] hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From ba9acba6ce398151ff9d246585da77d78dba9b5b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:28:49 -0700 Subject: [PATCH 139/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 60744fb79..4a4456dbe 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,9 +144,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]=["self-hosted", "macOS", "ARM64"] + hashmap[manylinux_aarch64]="["self-hosted", "macOS", "ARM64"]"" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]=["self-hosted", "macOS", "ARM64"] + hashmap[macosx_arm64]="["self-hosted", "macOS", "ARM64"]"" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 7c4c0b7f1328d110f90fcf283a67e9c67552e8ff Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:29:46 -0700 Subject: [PATCH 140/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 4a4456dbe..a443f8d50 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,9 +144,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="["self-hosted", "macOS", "ARM64"]"" + hashmap[manylinux_aarch64]="SLA25" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="["self-hosted", "macOS", "ARM64"]"" + hashmap[macosx_arm64]="macos-13-large" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 2d9a8e2749f463623cd7b87cde1a70d38902fd45 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:32:13 -0700 Subject: [PATCH 141/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a443f8d50..0027d501d 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,9 +144,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="SLA25" + hashmap[manylinux_aarch64]="["self-hosted", "linux", "ARM64"]" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="macos-13-large" + hashmap[macosx_arm64]="["self-hosted", "macOS", "ARM64"]" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 9e6eb34ee0570abd71da51495aa13c30837409ae Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:38:37 -0700 Subject: [PATCH 142/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 0027d501d..88ddc9b9e 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -146,7 +146,7 @@ jobs: hashmap[manylinux_x86_64]="ubuntu-22.04" hashmap[manylinux_aarch64]="["self-hosted", "linux", "ARM64"]" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="["self-hosted", "macOS", "ARM64"]" + hashmap[macosx_arm64]="$(fromJSON('["self-hosted", "Windows", "X64"]')) hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From a16a4b25f582f9eebafaf36223841ef6ac9093b1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:39:28 -0700 Subject: [PATCH 143/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 88ddc9b9e..c87fb891b 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -146,7 +146,7 @@ jobs: hashmap[manylinux_x86_64]="ubuntu-22.04" hashmap[manylinux_aarch64]="["self-hosted", "linux", "ARM64"]" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="$(fromJSON('["self-hosted", "Windows", "X64"]')) + hashmap[macosx_arm64]=$(fromJSON('["self-hosted", "Windows", "X64"]')) hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 540dc6631bc7e6eee40335e8e50479e69100a002 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:42:39 -0700 Subject: [PATCH 144/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index c87fb891b..4e6dc01e5 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -146,7 +146,7 @@ jobs: hashmap[manylinux_x86_64]="ubuntu-22.04" hashmap[manylinux_aarch64]="["self-hosted", "linux", "ARM64"]" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]=$(fromJSON('["self-hosted", "Windows", "X64"]')) + hashmap[macosx_arm64]=$(fromJSON(["self-hosted", "Windows", "X64"])) hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From ada10aa94ade40697b5dc772ae4f4c92eb250ead Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 21:51:47 -0700 Subject: [PATCH 145/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 4e6dc01e5..84b817464 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,9 +144,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="["self-hosted", "linux", "ARM64"]" + hashmap[manylinux_aarch64]="self-hosted,linux,ARM64" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]=$(fromJSON(["self-hosted", "Windows", "X64"])) + hashmap[macosx_arm64]="self-hosted,macOS,ARM64" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 03c62f41fc5c5f965632d71fab524f89faa1bc72 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 22:18:02 -0700 Subject: [PATCH 146/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 84b817464..a443f8d50 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -144,9 +144,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="self-hosted,linux,ARM64" + hashmap[manylinux_aarch64]="SLA25" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="self-hosted,macOS,ARM64" + hashmap[macosx_arm64]="macos-13-large" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 92c8928b86e69e1927d45f52985b989b1a941a7d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 22:26:00 -0700 Subject: [PATCH 147/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a443f8d50..bf1fd4b5a 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -146,7 +146,7 @@ jobs: hashmap[manylinux_x86_64]="ubuntu-22.04" hashmap[manylinux_aarch64]="SLA25" hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="macos-13-large" + hashmap[macosx_arm64]="SMA" hashmap[win_amd64]="windows-2022" echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT # Bash >= 4 supports hashmaps From 2cd91f948ef230c1ec9137bc66eee7e1235485c0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 22:38:24 -0700 Subject: [PATCH 148/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index a20cb0c18..98eba7736 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -67,7 +67,6 @@ jobs: name: v115-manylinux_x86_64.node path: ./lib/binding/glibc@2.31/node-v115-linux-x64/ - - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node From 3d67dc470e392a651b65b56e73695bc93cb7b35c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 22:56:30 -0700 Subject: [PATCH 149/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 98eba7736..de8622dfd 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -77,6 +77,7 @@ jobs: name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ + ## Linux ARM #- uses: actions/download-artifact@v4 # with: From 0bbc0f2b6af79df16a7c220d2579151b874937b7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 23:13:12 -0700 Subject: [PATCH 150/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index de8622dfd..98eba7736 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -77,7 +77,6 @@ jobs: name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ - ## Linux ARM #- uses: actions/download-artifact@v4 # with: From 9874dd6103aba0a7bfae747eed979972ea1ac818 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 8 Jan 2025 23:18:04 -0700 Subject: [PATCH 151/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 98eba7736..de8622dfd 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -77,6 +77,7 @@ jobs: name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ + ## Linux ARM #- uses: actions/download-artifact@v4 # with: From 96995b7ff997bb28186c4420f3fca97d0ff1cea9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 06:46:28 -0700 Subject: [PATCH 152/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index de8622dfd..98eba7736 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -77,7 +77,6 @@ jobs: name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ - ## Linux ARM #- uses: actions/download-artifact@v4 # with: From 6edc801ce39d20b6ce04f549727c375234d9001b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 08:24:12 -0700 Subject: [PATCH 153/417] CI/CD Improvement --- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/build-bindings.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 8a90cae06..6b5fc9d2f 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -88,7 +88,7 @@ jobs: "manylinux_x86_64", "manylinux_aarch64", "macosx_x86_64", - "macosx_arm64", + #"macosx_arm64", "win_amd64" ] fail-fast: false diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index bf1fd4b5a..2ec82e2ce 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -36,7 +36,7 @@ on: - manylinux_x86_64 - manylinux_aarch64 - macosx_x86_64 - - macosx_arm64 + #- macosx_arm64 - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 From 720e2b589a7eb33ad6899a02fc149f816822e2a8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 18:13:10 -0700 Subject: [PATCH 154/417] CI/CD Improvement --- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/build-bindings.yml | 4 +- .github/workflows/npm-install-script-test.yml | 72 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 6b5fc9d2f..8a90cae06 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -88,7 +88,7 @@ jobs: "manylinux_x86_64", "manylinux_aarch64", "macosx_x86_64", - #"macosx_arm64", + "macosx_arm64", "win_amd64" ] fail-fast: false diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2ec82e2ce..3131db20a 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -36,7 +36,7 @@ on: - manylinux_x86_64 - manylinux_aarch64 - macosx_x86_64 - #- macosx_arm64 + - macosx_arm64 - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 @@ -317,7 +317,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'win_amd64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/* name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 98eba7736..e2cfe75d1 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -36,25 +36,25 @@ jobs: path: ./lib/binding/node-v131-darwin-x64/ # MAC ARM - - uses: actions/download-artifact@v4 - with: - name: v108-macosx_x86_64.node - path: ./lib/binding/node-v108-darwin-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v108-macosx_x86_64.node + # path: ./lib/binding/node-v108-darwin-arm64/ - - uses: actions/download-artifact@v4 - with: - name: v115-macosx_x86_64.node - path: ./lib/binding/node-v115-darwin-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v115-macosx_x86_64.node + # path: ./lib/binding/node-v115-darwin-arm64/ - - uses: actions/download-artifact@v4 - with: - name: v127-macosx_x86_64.node - path: ./lib/binding/node-v127-darwin-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v127-macosx_x86_64.node + # path: ./lib/binding/node-v127-darwin-arm64/ - - uses: actions/download-artifact@v4 - with: - name: v131-macosx_x86_64.node - path: ./lib/binding/node-v131-darwin-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v131-macosx_x86_64.node + # path: ./lib/binding/node-v131-darwin-arm64/ # Linux X86 - uses: actions/download-artifact@v4 @@ -78,48 +78,48 @@ jobs: path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ ## Linux ARM - #- uses: actions/download-artifact@v4 - # with: - # name: v108-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.31/node-v108-linux-arm64/ + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v108-linux-arm64/ - #- uses: actions/download-artifact@v4 - # with: - # name: v115-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.31/node-v115-linux-arm64/ + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v115-linux-arm64/ - #- uses: actions/download-artifact@v4 - # with: - # name: v127-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.31/node-v127-linux-arm64/ + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v127-linux-arm64/ - #- uses: actions/download-artifact@v4 - # with: - # name: v131-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.31/node-v131-linux-arm64/ + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_x86_64.node + path: ./lib/binding/glibc@2.31/node-v131-linux-arm64/ # Windows - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v108-win32-x64/ + path: ./lib/binding/node-v108-win32-x64/ - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v115-win32-x64/ + path: ./lib/binding/node-v115-win32-x64/ - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v127-win32-x64/ + path: ./lib/binding/node-v127-win32-x64/ - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v131-win32-x64/ + path: ./lib/binding/node-v131-win32-x64/ - name: Install client shell: bash From 84834e85bd8eb2da0fdaa6e1c62b2607cf4fbb81 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 20:33:16 -0700 Subject: [PATCH 155/417] CI/CD Improvement --- .github/workflows/dev-workflow-p1.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 6d26a3bec..8e90900c7 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -27,12 +27,12 @@ on: default: false jobs: -# test-with-server-release: -# uses: ./.github/workflows/build-artifacts.yml -# with: -# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} -# sha-to-build-and-test: ${{ github.sha }} -# secrets: inherit + test-with-server-release: + uses: ./.github/workflows/build-artifacts.yml + with: + run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} + sha-to-build-and-test: ${{ github.sha }} + secrets: inherit # test-with-server-rc: # needs: test-with-server-release From 24faa3fbadc9ca0993abb37b73924398abd782d4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 20:49:00 -0700 Subject: [PATCH 156/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3131db20a..2cc99bb3c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -336,7 +336,7 @@ jobs: fail-fast: false matrix: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} - runs-on: ${{ inputs.platform-tag == 'macosx_arm64' && fromJSON('["self-hosted", "macOS", "ARM64"]') || fromJSON('["self-hosted", "Windows", "X64"]') }} + runs-on: ${{ inputs.platform-tag == 'macosx_arm64' && fromJSON('["self-hosted", "macOS", "ARM64", "SMA"]') || fromJSON('["self-hosted", "Windows", "X64"]') }} env: BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}" steps: From 1eee0b39d734b6083d50f994873139b8c3500f32 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 21:06:41 -0700 Subject: [PATCH 157/417] CI/CD Improvement --- .github/actions/run-ee-server-for-ext-container/action.yml | 5 +++++ .github/actions/run-ee-server/action.yml | 6 ++++++ .github/workflows/build-bindings.yml | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index 3d9c5c765..a6f22b652 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,6 +31,11 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash + - name: Pipx install + run: python -m pip install --user pipx + working-directory: .github/workflows + shell: bash + - name: Configure tests to connect to that Docker container run: | pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index d6fdf3c72..b455da892 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -25,6 +25,12 @@ inputs: runs: using: "composite" steps: + + - name: Pipx install + run: python -m pip install --user pipx + working-directory: .github/workflows + shell: bash + - name: Install crudini to manipulate config.conf # This will only work on the Github hosted runners. run: pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt" diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2cc99bb3c..7eb3c5e80 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -465,7 +465,7 @@ jobs: run: | $env:DOCKER_HOST_IP = $env:DOCKER_HOST | foreach {$_.replace("tcp://","")} | foreach {$_.replace(":2375", "")} crudini --set config.conf enterprise-edition hosts ${env:DOCKER_HOST_IP}:3000 - working-directory: github\workflows + working-directory: .github\workflows # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - run: | From e63a561c644aec99b10743f5ad09781120b802fb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 21:13:07 -0700 Subject: [PATCH 158/417] CI/CD Improvement --- .github/actions/run-ee-server-for-ext-container/action.yml | 6 +++++- .github/actions/run-ee-server/action.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index a6f22b652..a3837f767 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,11 +31,15 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash + - uses: actions/setup-python@v4 + with: + python-version: 3.11 + - name: Pipx install run: python -m pip install --user pipx working-directory: .github/workflows shell: bash - + - name: Configure tests to connect to that Docker container run: | pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index b455da892..f0cd960d1 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -26,11 +26,15 @@ runs: using: "composite" steps: + - uses: actions/setup-python@v4 + with: + python-version: 3.11 + - name: Pipx install run: python -m pip install --user pipx working-directory: .github/workflows shell: bash - + - name: Install crudini to manipulate config.conf # This will only work on the Github hosted runners. run: pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt" From c6e898209df844a7103a62a218c4a97e5298cc69 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 21:31:32 -0700 Subject: [PATCH 159/417] CI/CD Improvement --- .../run-ee-server-for-ext-container/action.yml | 10 +--------- .github/actions/run-ee-server/action.yml | 13 +++---------- .github/workflows/build-bindings.yml | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index a3837f767..77aab7285 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,17 +31,9 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash - - uses: actions/setup-python@v4 - with: - python-version: 3.11 - - - name: Pipx install - run: python -m pip install --user pipx - working-directory: .github/workflows - shell: bash - - name: Configure tests to connect to that Docker container run: | + python3 -m pip install --user pipx pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; crudini --existing=param --set config.conf enterprise-edition hosts ${{ steps.get-server-ip-address.outputs.server-ip }}:3000; cat config.conf diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index f0cd960d1..5ed04c55f 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -26,18 +26,11 @@ runs: using: "composite" steps: - - uses: actions/setup-python@v4 - with: - python-version: 3.11 - - - name: Pipx install - run: python -m pip install --user pipx - working-directory: .github/workflows - shell: bash - - name: Install crudini to manipulate config.conf # This will only work on the Github hosted runners. - run: pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt" + run: | + python3 -m pip install --user pipx + pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt" working-directory: .github/workflows shell: bash diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7eb3c5e80..c21e450f3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -469,7 +469,7 @@ jobs: # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - run: | - tsc; + npx tsc; working-directory: ts-test shell: bash From 11c07ca0ce80df864fee39c500536f8565675f4f Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 21:42:14 -0700 Subject: [PATCH 160/417] CI/CD Improvement --- .github/actions/run-ee-server-for-ext-container/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index 77aab7285..e71f23d4f 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -31,6 +31,7 @@ runs: run: echo server-ip=$(docker container inspect -f '{{ .NetworkSettings.IPAddress }}' aerospike) >> $GITHUB_OUTPUT shell: bash + - name: Configure tests to connect to that Docker container run: | python3 -m pip install --user pipx From 0ee0f8d76000a7a8384902f705b3cfe618c0448a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 21:52:13 -0700 Subject: [PATCH 161/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index c21e450f3..bbc9b273c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -268,7 +268,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run test dist/${{ inputs.test-file }} #slow -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! #- name: Build wheel From fa33e21c1b0fbae9452cf886d824fef9553b0e1d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 22:07:18 -0700 Subject: [PATCH 162/417] CI/CD Improvement --- .github/actions/run-ee-server/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/run-ee-server/action.yml b/.github/actions/run-ee-server/action.yml index 5ed04c55f..00d121de0 100644 --- a/.github/actions/run-ee-server/action.yml +++ b/.github/actions/run-ee-server/action.yml @@ -29,7 +29,6 @@ runs: - name: Install crudini to manipulate config.conf # This will only work on the Github hosted runners. run: | - python3 -m pip install --user pipx pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt" working-directory: .github/workflows shell: bash From 67132af9ffc39d8944348c6e1f37ee3a48664e00 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 9 Jan 2025 22:36:22 -0700 Subject: [PATCH 163/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index bbc9b273c..215beee7f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -469,6 +469,7 @@ jobs: # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - run: | + npm install typescript --save-dev npx tsc; working-directory: ts-test shell: bash From 56ef26f31a1eb13cde6fe4025f631d992228e38e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 00:10:22 -0700 Subject: [PATCH 164/417] CI/CD Improvement --- .../actions/run-ee-server-for-ext-container/action.yml | 1 - .github/workflows/build-bindings.yml | 5 +++++ .github/workflows/dev-workflow-p2.yml | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/actions/run-ee-server-for-ext-container/action.yml b/.github/actions/run-ee-server-for-ext-container/action.yml index e71f23d4f..9bf2d7544 100644 --- a/.github/actions/run-ee-server-for-ext-container/action.yml +++ b/.github/actions/run-ee-server-for-ext-container/action.yml @@ -34,7 +34,6 @@ runs: - name: Configure tests to connect to that Docker container run: | - python3 -m pip install --user pipx pipx install crudini --pip-args "-c ${{ github.workspace }}/.github/workflows/requirements.txt"; crudini --existing=param --set config.conf enterprise-edition hosts ${{ steps.get-server-ip-address.outputs.server-ip }}:3000; cat config.conf diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 215beee7f..050251435 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -204,6 +204,10 @@ jobs: docker-hub-username: ${{ secrets.DOCKER_HUB_BOT_USERNAME }} docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} + - name: Remove aerospike docker image + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} + run: docker rm -f $(docker ps -aq) + # TODO: combine this composite action and the above into one - name: "Linux: run Aerospike server in Docker container and configure config.conf to connect to the server container's Docker IP address" if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} @@ -320,6 +324,7 @@ jobs: path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/* name: ${{ env.BUILD_IDENTIFIER }}.node + - name: Set final commit status uses: myrotvorets/set-commit-status-action@v2.0.0 if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index ef4eec3c3..b906732e5 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -20,10 +20,10 @@ jobs: # change: 'bump-dev-num' # secrets: inherit - release-package: - name: release npm package - uses: ./.github/workflows/release-package.yml - secrets: inherit +# release-package: +# name: release npm package +# uses: ./.github/workflows/release-package.yml +# secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number From aa0a587171328d992e67e4b236ef77be951a0ab0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 00:16:39 -0700 Subject: [PATCH 165/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 050251435..6c65cb78b 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -206,7 +206,7 @@ jobs: - name: Remove aerospike docker image if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} - run: docker rm -f $(docker ps -aq) + run: docker ps -aq | grep -q . && docker rm -f $(docker ps -aq) # TODO: combine this composite action and the above into one - name: "Linux: run Aerospike server in Docker container and configure config.conf to connect to the server container's Docker IP address" From 8b5b8635de9385c22c78a67e67115a54e7da3230 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 00:21:22 -0700 Subject: [PATCH 166/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 6c65cb78b..fde2350b2 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -205,7 +205,7 @@ jobs: docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} - name: Remove aerospike docker image - if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && startsWith(inputs.platform-tag, 'manylinux') }} + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'manylinux_aarch64' }} run: docker ps -aq | grep -q . && docker rm -f $(docker ps -aq) # TODO: combine this composite action and the above into one From 1df532bc99e3414f33d6655d24570a2e7d6f5fe5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 00:23:40 -0700 Subject: [PATCH 167/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index fde2350b2..9e5d06b65 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -206,7 +206,12 @@ jobs: - name: Remove aerospike docker image if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'manylinux_aarch64' }} - run: docker ps -aq | grep -q . && docker rm -f $(docker ps -aq) + run: | + if docker ps -aq | grep -q .; then + docker rm -f $(docker ps -aq) || echo "Failed to remove one or more containers." + else + echo "No containers to remove." + fi # TODO: combine this composite action and the above into one - name: "Linux: run Aerospike server in Docker container and configure config.conf to connect to the server container's Docker IP address" From edfd1ef53a74f052ca7f91d26a6fb098586aa920 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 01:03:26 -0700 Subject: [PATCH 168/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 9e5d06b65..678daa168 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -477,12 +477,12 @@ jobs: crudini --set config.conf enterprise-edition hosts ${env:DOCKER_HOST_IP}:3000 working-directory: .github\workflows - # FIGURE OUT WHAT SETUP NEEDS TO HAPPEN - - run: | - npm install typescript --save-dev - npx tsc; - working-directory: ts-test - shell: bash + ## FIGURE OUT WHAT SETUP NEEDS TO HAPPEN + #- run: | + # npm install typescript --save-dev + # npx tsc; + # working-directory: ts-test + # shell: bash - run: npm run test dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000 shell: bash From ee846cd382fc58348adbe01860b4f58a87305439 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 01:32:54 -0700 Subject: [PATCH 169/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 678daa168..68a9e4079 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -484,7 +484,8 @@ jobs: # working-directory: ts-test # shell: bash - - run: npm run test dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000 + - run: rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/${npm_config_testfile:-} dist/ --h --port 3000 + - run: rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/-- --h ${env:DOCKER_HOST_IP} --port 3000 shell: bash - name: Show job status for commit From 044f945d619433a3bd5899dcee734dad689fcef0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 01:43:55 -0700 Subject: [PATCH 170/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 68a9e4079..dd29082b3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -369,6 +369,14 @@ jobs: - if: ${{ inputs.platform-tag == 'macosx_arm64' && inputs.use-server-rc }} run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} + - name: Remove aerospike docker image + run: | + if docker ps -aq | grep -q .; then + docker rm -f $(docker ps -aq) || echo "Failed to remove one or more containers." + else + echo "No containers to remove." + fi + - uses: ./.github/actions/run-ee-server with: use-server-rc: ${{ inputs.use-server-rc }} @@ -484,8 +492,7 @@ jobs: # working-directory: ts-test # shell: bash - - run: rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/${npm_config_testfile:-} dist/ --h --port 3000 - - run: rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/-- --h ${env:DOCKER_HOST_IP} --port 3000 + - run: rm -r -f ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000 shell: bash - name: Show job status for commit From 02233c95a10c5b962fb712d3a0a9a87d3e31f96a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:04:39 -0700 Subject: [PATCH 171/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index dd29082b3..ce27c20d6 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -386,7 +386,16 @@ jobs: - name: Download wheel uses: actions/download-artifact@v4 + if: ${{ inputs.platform-tag == 'macosx_arm64' }} with: + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-arm64/aerospike.node + name: ${{ env.BUILD_IDENTIFIER }}.node + + - name: Download wheel + uses: actions/download-artifact@v4 + if: ${{ inputs.platform-tag == 'win_amd64' }} + with: + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Convert Python tag to Python version @@ -492,8 +501,18 @@ jobs: # working-directory: ts-test # shell: bash - - run: rm -r -f ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000 - shell: bash + - name: Run tests + run: | + docker ps; + docker logs aerospike; + cd ts-test; + npm uninstall tsc; + npm install -D typescript; + npm install ..; + npm i --save-dev @types/jest; + npx tsc; + cd ..; + rm -r -f ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; - name: Show job status for commit if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} From fb03896c5eb16f6c2a122ed2af0f4f2d17adb50b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:08:52 -0700 Subject: [PATCH 172/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index ce27c20d6..48b3cd9f3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -27,7 +27,7 @@ on: type: string description: Valid JSON list of Python tags to build the client for required: false - default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' + default: '[["v108", "18"]]' platform-tag: description: Platform to build the client for. type: choice @@ -80,7 +80,7 @@ on: nodejs-tags: type: string required: false - default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' + default: '[["v108", "18"]]' platform-tag: type: string required: true From 5466b935f505da687b20a7eb8b1cf89fb2d651d9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:15:04 -0700 Subject: [PATCH 173/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 48b3cd9f3..a0060e022 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -507,8 +507,8 @@ jobs: docker logs aerospike; cd ts-test; npm uninstall tsc; - npm install -D typescript; npm install ..; + npm i --save-dev @types/chai; npm i --save-dev @types/jest; npx tsc; cd ..; From 3822ca1e86b5e16641419cc1f968336ad7e7b0df Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:18:38 -0700 Subject: [PATCH 174/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a0060e022..9d7e8d202 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -370,6 +370,7 @@ jobs: run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }} - name: Remove aerospike docker image + if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | if docker ps -aq | grep -q .; then docker rm -f $(docker ps -aq) || echo "Failed to remove one or more containers." @@ -377,6 +378,16 @@ jobs: echo "No containers to remove." fi + - name: Remove aerospike docker image + if: ${{ inputs.platform-tag == 'win_amd64' }} + run: | + if (docker ps -aq) { + docker ps -aq | ForEach-Object { docker rm -f $_ } || Write-Host "Failed to remove one or more containers." + } + else { + Write-Host "No containers to remove." + } + - uses: ./.github/actions/run-ee-server with: use-server-rc: ${{ inputs.use-server-rc }} From 5f4095177c905dddb57b2cecdbadbea815734203 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:19:31 -0700 Subject: [PATCH 175/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 9d7e8d202..79a94fe08 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -522,8 +522,8 @@ jobs: npm i --save-dev @types/chai; npm i --save-dev @types/jest; npx tsc; - cd ..; rm -r -f ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; + cd ..; - name: Show job status for commit if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} From e296409fdff61db1e06dd3bda0f96973c119fa7a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:25:36 -0700 Subject: [PATCH 176/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 79a94fe08..9aab9f904 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -522,7 +522,7 @@ jobs: npm i --save-dev @types/chai; npm i --save-dev @types/jest; npx tsc; - rm -r -f ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; + rm -r -f dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; - name: Show job status for commit From a9d6660279e13e49e59a107372b5c2a670c246c0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:34:25 -0700 Subject: [PATCH 177/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 9aab9f904..50365c5a5 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -513,6 +513,22 @@ jobs: # shell: bash - name: Run tests + if: ${{ inputs.platform-tag == 'macosx_arm64' }} + run: | + docker ps; + docker logs aerospike; + cd ts-test; + npm uninstall tsc; + npm install ..; + npm i --save-dev @types/chai; + npm i --save-dev @types/jest; + npm i --save-dev @types/chai; + npx tsc; + rm -rf dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; + cd ..; + + - name: Run tests + if: ${{ inputs.platform-tag == 'win_amd64' }} run: | docker ps; docker logs aerospike; @@ -521,8 +537,9 @@ jobs: npm install ..; npm i --save-dev @types/chai; npm i --save-dev @types/jest; + npm i --save-dev @types/chai; npx tsc; - rm -r -f dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; + rm -r -Force dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; - name: Show job status for commit From 4c90ef832bef08ba141cf07a1aed41dcb62b420d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:38:20 -0700 Subject: [PATCH 178/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 50365c5a5..12cffd9b5 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -522,7 +522,7 @@ jobs: npm install ..; npm i --save-dev @types/chai; npm i --save-dev @types/jest; - npm i --save-dev @types/chai; + npm i --save-dev @types/mocha; npx tsc; rm -rf dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; @@ -537,7 +537,7 @@ jobs: npm install ..; npm i --save-dev @types/chai; npm i --save-dev @types/jest; - npm i --save-dev @types/chai; + npm i --save-dev @types/mocha; npx tsc; rm -r -Force dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; From 413d83549cf0c1f88d1ec3e19b974a2ac5c81450 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:51:59 -0700 Subject: [PATCH 179/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 12cffd9b5..e90479a1f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -523,9 +523,11 @@ jobs: npm i --save-dev @types/chai; npm i --save-dev @types/jest; npm i --save-dev @types/mocha; + npm install mocha; npx tsc; - rm -rf dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; + npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; + - name: Run tests if: ${{ inputs.platform-tag == 'win_amd64' }} @@ -538,6 +540,7 @@ jobs: npm i --save-dev @types/chai; npm i --save-dev @types/jest; npm i --save-dev @types/mocha; + npm install mocha npx tsc; rm -r -Force dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; From 6b734ed79b9fd423d55dd79d9bef3a6938cf92d9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 02:56:55 -0700 Subject: [PATCH 180/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index e90479a1f..a2f66fbae 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -512,6 +512,9 @@ jobs: # working-directory: ts-test # shell: bash + - name: Identify binaries + run: ls lib\binding + - name: Run tests if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | @@ -540,7 +543,7 @@ jobs: npm i --save-dev @types/chai; npm i --save-dev @types/jest; npm i --save-dev @types/mocha; - npm install mocha + npm install mocha; npx tsc; rm -r -Force dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; From bfe6e3ba4579520f1e49d3f80bacdb27109cc721 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 03:01:03 -0700 Subject: [PATCH 181/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a2f66fbae..5ff94841b 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -513,7 +513,7 @@ jobs: # shell: bash - name: Identify binaries - run: ls lib\binding + run: ls ./lib/binding - name: Run tests if: ${{ inputs.platform-tag == 'macosx_arm64' }} From b4c96a51c1580a2bfccc07c879ae164cf8880092 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 03:05:43 -0700 Subject: [PATCH 182/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 5ff94841b..18cb9960c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -513,7 +513,7 @@ jobs: # shell: bash - name: Identify binaries - run: ls ./lib/binding + run: ls ./lib/binding/node-v108-darwin-arm64 - name: Run tests if: ${{ inputs.platform-tag == 'macosx_arm64' }} From 1462ed0a75df43e630c239e41030782ab3b0682e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 03:15:52 -0700 Subject: [PATCH 183/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 18cb9960c..6dc475f5f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -326,10 +326,9 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'win_amd64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/* + path: ./build/Release/* name: ${{ env.BUILD_IDENTIFIER }}.node - - name: Set final commit status uses: myrotvorets/set-commit-status-action@v2.0.0 if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} @@ -513,6 +512,7 @@ jobs: # shell: bash - name: Identify binaries + if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: ls ./lib/binding/node-v108-darwin-arm64 - name: Run tests From ee071f9393abda2e80745e07b2d720da45ec04fc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 03:24:10 -0700 Subject: [PATCH 184/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 6dc475f5f..9d54ac29f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -529,6 +529,7 @@ jobs: npm install mocha; npx tsc; cd ..; + npm install; npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; From 28aec759af71ebf29747962e1073fdbc510b5f46 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 03:29:05 -0700 Subject: [PATCH 185/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 9d54ac29f..15ac7b6b1 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -530,6 +530,8 @@ jobs: npx tsc; cd ..; npm install; + ls ./lib/binding/; + ls ./lib/binding/node-v108-darwin-arm64/; npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; @@ -546,7 +548,7 @@ jobs: npm i --save-dev @types/mocha; npm install mocha; npx tsc; - rm -r -Force dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; + rm -r -Force dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; npx mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; - name: Show job status for commit From 1eb6a29a68458c7cc97d547061ecae64364edd60 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 07:49:23 -0700 Subject: [PATCH 186/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 15ac7b6b1..ec2fcfba8 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -527,11 +527,14 @@ jobs: npm i --save-dev @types/jest; npm i --save-dev @types/mocha; npm install mocha; + rm -rf dist; npx tsc; cd ..; npm install; ls ./lib/binding/; ls ./lib/binding/node-v108-darwin-arm64/; + ls ./lib/binding/node-v108-darwin-arm64/aerospike.node; + pwd; npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; @@ -547,9 +550,11 @@ jobs: npm i --save-dev @types/jest; npm i --save-dev @types/mocha; npm install mocha; + rm -r -Force dist; npx tsc; - rm -r -Force dist; npx tsc ; cp tests/udf.lua dist/udf.lua ; npx mocha dist/ -- --h ${env:DOCKER_HOST_IP} --port 3000; cd ..; + npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; + - name: Show job status for commit if: ${{ always() && github.event_name != 'push' && github.event_name != 'pull_request' }} diff --git a/package.json b/package.json index 5eb089650..b9e36ad25 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "install": "npm run build", "build": "node-pre-gyp install --fallback-to-build", "test-prereq": "cd ts-test; npm install ..; run: npm i --save-dev @types/jest; run: npm i --save-dev @types/chai; cd ..;", - "test": "rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/${npm_config_testfile:-} ", + "test": "cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/${npm_config_testfile:-} ", "test-dry-run": "mocha --dry-run", "test-noserver": "GLOBAL_CLIENT=false mocha -g '#noserver'", "lint": "standard", From 0c461ba3c37ea95a3d17073f459a5d13e8ec1343 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 08:13:52 -0700 Subject: [PATCH 187/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index ec2fcfba8..7627c18ad 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -550,7 +550,6 @@ jobs: npm i --save-dev @types/jest; npm i --save-dev @types/mocha; npm install mocha; - rm -r -Force dist; npx tsc; cd ..; npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; From 95d60a37e63f7885d10d635e30de6cb0efb09638 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 08:31:15 -0700 Subject: [PATCH 188/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7627c18ad..b9cc7f083 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -513,7 +513,9 @@ jobs: - name: Identify binaries if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: ls ./lib/binding/node-v108-darwin-arm64 + run: | + ls ./lib/binding/node-v108-darwin-arm64 + cp -r ./lib/binding/node-v108-darwin-arm64/ build/Release/ - name: Run tests if: ${{ inputs.platform-tag == 'macosx_arm64' }} @@ -551,8 +553,9 @@ jobs: npm i --save-dev @types/mocha; npm install mocha; npx tsc; + cp tests\udf.lua dist\udf.lua ; + mocha dist -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; cd ..; - npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; - name: Show job status for commit From 2fed5ae44071f410f0fb4c06211e916c717dbb8f Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 08:38:43 -0700 Subject: [PATCH 189/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index b9cc7f083..197a147f6 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -515,7 +515,10 @@ jobs: if: ${{ inputs.platform-tag == 'macosx_arm64' }} run: | ls ./lib/binding/node-v108-darwin-arm64 + ls ./lib/binding/node-v108-darwin-arm64/aerospike.node cp -r ./lib/binding/node-v108-darwin-arm64/ build/Release/ + mkdir -p build; + mkdir -p build/Release; - name: Run tests if: ${{ inputs.platform-tag == 'macosx_arm64' }} @@ -552,10 +555,11 @@ jobs: npm i --save-dev @types/jest; npm i --save-dev @types/mocha; npm install mocha; + ls lib\binding\node-v108-win32-x64; npx tsc; cp tests\udf.lua dist\udf.lua ; mocha dist -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; - cd ..; + cd ..; - name: Show job status for commit From 7963bd415b9f42bce80406163cc5ea7d72fe8db9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 08:39:23 -0700 Subject: [PATCH 190/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 197a147f6..77f2c8820 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -556,6 +556,7 @@ jobs: npm i --save-dev @types/mocha; npm install mocha; ls lib\binding\node-v108-win32-x64; + ls lib\binding\node-v108-win32-x64\aerospike.node; npx tsc; cp tests\udf.lua dist\udf.lua ; mocha dist -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; From 39056d37f85a99a2341eadc2b95555aef2dd04cb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 08:53:20 -0700 Subject: [PATCH 191/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 77f2c8820..82b96b9ad 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -258,7 +258,7 @@ jobs: - name: Run tests - if: ${{ inputs.run_tests && inputs.platform-tag == 'manylinux_x86_64'}} + if: ${{ inputs.run_tests && (inputs.platform-tag == 'manylinux_x86_64' || inputs.platform-tag == 'manylinux_aarch64' }} run: | docker ps; docker logs aerospike; @@ -516,9 +516,9 @@ jobs: run: | ls ./lib/binding/node-v108-darwin-arm64 ls ./lib/binding/node-v108-darwin-arm64/aerospike.node - cp -r ./lib/binding/node-v108-darwin-arm64/ build/Release/ mkdir -p build; mkdir -p build/Release; + cp -r ./lib/binding/node-v108-darwin-arm64 build/Release - name: Run tests if: ${{ inputs.platform-tag == 'macosx_arm64' }} From cf93fc65f49b113dfc9181185bbc6092bf09f069 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 08:54:42 -0700 Subject: [PATCH 192/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 82b96b9ad..0c4e4aa51 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -258,7 +258,7 @@ jobs: - name: Run tests - if: ${{ inputs.run_tests && (inputs.platform-tag == 'manylinux_x86_64' || inputs.platform-tag == 'manylinux_aarch64' }} + if: ${{ inputs.run_tests && (inputs.platform-tag == 'manylinux_x86_64' || inputs.platform-tag == 'manylinux_aarch64') }} run: | docker ps; docker logs aerospike; From 99247602b3415903a4289feaa9e941ce91114feb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 09:01:27 -0700 Subject: [PATCH 193/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 0c4e4aa51..7c18ed155 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -398,14 +398,14 @@ jobs: uses: actions/download-artifact@v4 if: ${{ inputs.platform-tag == 'macosx_arm64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-arm64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-arm64/ name: ${{ env.BUILD_IDENTIFIER }}.node - name: Download wheel uses: actions/download-artifact@v4 if: ${{ inputs.platform-tag == 'win_amd64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-win32-x64/ name: ${{ env.BUILD_IDENTIFIER }}.node - name: Convert Python tag to Python version From 44354388b8ed33889f62dfe4e36d3f68f668c996 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 09:06:03 -0700 Subject: [PATCH 194/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 7c18ed155..6933cd82f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -540,7 +540,7 @@ jobs: ls ./lib/binding/node-v108-darwin-arm64/; ls ./lib/binding/node-v108-darwin-arm64/aerospike.node; pwd; - npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; + npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --U superuser --P superuser; - name: Run tests @@ -559,7 +559,7 @@ jobs: ls lib\binding\node-v108-win32-x64\aerospike.node; npx tsc; cp tests\udf.lua dist\udf.lua ; - mocha dist -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; + mocha dist -- --h localhost--port 3000 --U superuser --P superuser; cd ..; From 0d4e1bdbcf567bc077374b2e7073f8fe5ea0bca6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 09:23:38 -0700 Subject: [PATCH 195/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 6933cd82f..36eaba6e8 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -548,6 +548,8 @@ jobs: run: | docker ps; docker logs aerospike; + ls lib\binding\node-v108-win32-x64; + ls lib\binding\node-v108-win32-x64\aerospike.node; cd ts-test; npm uninstall tsc; npm install ..; @@ -555,11 +557,9 @@ jobs: npm i --save-dev @types/jest; npm i --save-dev @types/mocha; npm install mocha; - ls lib\binding\node-v108-win32-x64; - ls lib\binding\node-v108-win32-x64\aerospike.node; npx tsc; cp tests\udf.lua dist\udf.lua ; - mocha dist -- --h localhost--port 3000 --U superuser --P superuser; + mocha dist -- --h localhost --port 3000 --U superuser --P superuser; cd ..; From 6c68a5ac86f457f7489dc65170bd6b7e1f2c7d5f Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 09:37:18 -0700 Subject: [PATCH 196/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 36eaba6e8..59a3c499f 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -559,7 +559,7 @@ jobs: npm install mocha; npx tsc; cp tests\udf.lua dist\udf.lua ; - mocha dist -- --h localhost --port 3000 --U superuser --P superuser; + npx mocha dist -- --h localhost --port 3000 --U superuser --P superuser; cd ..; From fff7c6bbb2b875adc80917dee6192a7e20226c88 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 09:51:45 -0700 Subject: [PATCH 197/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 59a3c499f..5c6ffa33c 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -559,7 +559,7 @@ jobs: npm install mocha; npx tsc; cp tests\udf.lua dist\udf.lua ; - npx mocha dist -- --h localhost --port 3000 --U superuser --P superuser; + npx mocha dist -- --h ${env:DOCKER_HOST_IP} --port 3000 --U superuser --P superuser; cd ..; From fc506d5a18495f19325dc3a3ac6eed60d4223617 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 10:24:26 -0700 Subject: [PATCH 198/417] CI/CD Improvement --- .github/workflows/dev-workflow-p2.yml | 8 ++++---- .github/workflows/npm-install-script-test.yml | 14 ++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index b906732e5..ef4eec3c3 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -20,10 +20,10 @@ jobs: # change: 'bump-dev-num' # secrets: inherit -# release-package: -# name: release npm package -# uses: ./.github/workflows/release-package.yml -# secrets: inherit + release-package: + name: release npm package + uses: ./.github/workflows/release-package.yml + secrets: inherit # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index e2cfe75d1..10fdca695 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -158,8 +158,14 @@ jobs: with: node-version: 20 - - name: Run Node.js script - run: node ./scripts/prebuiltBinding.js + - name: Set version + run: npm version 6.0.1.dev1 --no-git-tag-version - - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" \ No newline at end of file + - name: verdaccio server run + run: | + docker run -it — rm — name verdaccio -p 4873:4873 verdaccio/verdaccio + npm adduser — registry http://0.0.0.0:4873/ + npm publish — registry http://0.0.0.0:4873/ + + #- name: List available artifacts + # run: ls ./lib/binding || echo "No artifacts found in binding" \ No newline at end of file From c90b26ce365876483993860a94f735c524b72bc8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 10:39:54 -0700 Subject: [PATCH 199/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 4 ++-- .github/workflows/npm-install-script-test.yml | 3 +++ .github/workflows/release-package.yml | 12 ++++++------ scripts/change-install-command.js | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 scripts/change-install-command.js diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 5c6ffa33c..3f65c43d4 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -27,7 +27,7 @@ on: type: string description: Valid JSON list of Python tags to build the client for required: false - default: '[["v108", "18"]]' + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' platform-tag: description: Platform to build the client for. type: choice @@ -80,7 +80,7 @@ on: nodejs-tags: type: string required: false - default: '[["v108", "18"]]' + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' platform-tag: type: string required: true diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 10fdca695..0166f174d 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -161,6 +161,9 @@ jobs: - name: Set version run: npm version 6.0.1.dev1 --no-git-tag-version + - name: Change install command for release + run: node ./scripts/change-install-command.js + - name: verdaccio server run run: | docker run -it — rm — name verdaccio -p 4873:4873 verdaccio/verdaccio diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index 7f375d269..7877ee909 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -7,12 +7,12 @@ on: - 'package.json' jobs: - bump-dev-number: - #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit +# bump-dev-number: +# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit rebuild-artifacts-with-new-dev-num: name: Rebuild artifacts diff --git a/scripts/change-install-command.js b/scripts/change-install-command.js new file mode 100644 index 000000000..f72141ebf --- /dev/null +++ b/scripts/change-install-command.js @@ -0,0 +1,15 @@ +const fs = require('fs'); + +// Path to package.json +const packageJsonPath = './package.json'; + +// Read and parse package.json +const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')); + +// Update the install script +packageJson.scripts.install = "npm-run-all removeExtraBinaries build"; + +// Write the updated package.json back +fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8'); + +console.log('Updated the install script in package.json successfully.'); \ No newline at end of file From 6a8cef0bfa06c6ec394594954059de90a3d6e03e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 10:49:20 -0700 Subject: [PATCH 200/417] CI/CD Improvement --- scripts/change-install-command.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/change-install-command.js b/scripts/change-install-command.js index f72141ebf..4ccdee868 100644 --- a/scripts/change-install-command.js +++ b/scripts/change-install-command.js @@ -1,15 +1,15 @@ -const fs = require('fs'); +const fs = require('fs') // Path to package.json -const packageJsonPath = './package.json'; +const packageJsonPath = './package.json' // Read and parse package.json -const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')); +const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')) // Update the install script -packageJson.scripts.install = "npm-run-all removeExtraBinaries build"; +packageJson.scripts.install = 'npm-run-all removeExtraBinaries build' // Write the updated package.json back -fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8'); +fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf8') -console.log('Updated the install script in package.json successfully.'); \ No newline at end of file +console.log('Updated the install script in package.json successfully.') From 7e484c4a36e74107c35637bbd081c5b64b41e520 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 11:23:07 -0700 Subject: [PATCH 201/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 5 ----- .github/workflows/npm-install-script-test.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 3f65c43d4..0d977e41e 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -536,9 +536,6 @@ jobs: npx tsc; cd ..; npm install; - ls ./lib/binding/; - ls ./lib/binding/node-v108-darwin-arm64/; - ls ./lib/binding/node-v108-darwin-arm64/aerospike.node; pwd; npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --U superuser --P superuser; @@ -548,8 +545,6 @@ jobs: run: | docker ps; docker logs aerospike; - ls lib\binding\node-v108-win32-x64; - ls lib\binding\node-v108-win32-x64\aerospike.node; cd ts-test; npm uninstall tsc; npm install ..; diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 0166f174d..df472130d 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -159,7 +159,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.1.dev1 --no-git-tag-version + run: npm version 6.0.1-dev.1 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js From 81b6e342734fdcdf7e7af6b9186eafc3f40c6b74 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 11:43:06 -0700 Subject: [PATCH 202/417] CI/CD Improvement --- .github/workflows/build-bindings.yml | 16 ++++++++-------- .github/workflows/npm-install-script-test.yml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 0d977e41e..1527ee8fe 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -511,14 +511,14 @@ jobs: # working-directory: ts-test # shell: bash - - name: Identify binaries - if: ${{ inputs.platform-tag == 'macosx_arm64' }} - run: | - ls ./lib/binding/node-v108-darwin-arm64 - ls ./lib/binding/node-v108-darwin-arm64/aerospike.node - mkdir -p build; - mkdir -p build/Release; - cp -r ./lib/binding/node-v108-darwin-arm64 build/Release + #- name: Identify binaries + # if: ${{ inputs.platform-tag == 'macosx_arm64' }} + # run: | + # ls ./lib/binding/node-v108-darwin-arm64 + # ls ./lib/binding/node-v108-darwin-arm64/aerospike.node + # mkdir -p build; + # mkdir -p build/Release; + # cp -r ./lib/binding/node-v108-darwin-arm64 build/Release - name: Run tests if: ${{ inputs.platform-tag == 'macosx_arm64' }} diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index df472130d..881fe3a54 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -166,9 +166,9 @@ jobs: - name: verdaccio server run run: | - docker run -it — rm — name verdaccio -p 4873:4873 verdaccio/verdaccio - npm adduser — registry http://0.0.0.0:4873/ - npm publish — registry http://0.0.0.0:4873/ + docker run --rm --name verdaccio -p 4873:4873 verdaccio/verdaccio + npm adduser --registry http://0.0.0.0:4873/ + npm publish --registry http://0.0.0.0:4873/ #- name: List available artifacts # run: ls ./lib/binding || echo "No artifacts found in binding" \ No newline at end of file From be49a65f81bd5125e7e0737d9519b43e8b15c550 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 12:09:22 -0700 Subject: [PATCH 203/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 881fe3a54..6f7d886d0 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -166,7 +166,7 @@ jobs: - name: verdaccio server run run: | - docker run --rm --name verdaccio -p 4873:4873 verdaccio/verdaccio + docker run --rm -d --name verdaccio -p 4873:4873 verdaccio/verdaccio npm adduser --registry http://0.0.0.0:4873/ npm publish --registry http://0.0.0.0:4873/ From 7ebb5c4eb0650fbd977ef9d518937df37b22b4ce Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 12:21:17 -0700 Subject: [PATCH 204/417] CI/CD Improvement --- .github/workflows/npm-install-script-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 6f7d886d0..5ab31c5e4 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -167,6 +167,7 @@ jobs: - name: verdaccio server run run: | docker run --rm -d --name verdaccio -p 4873:4873 verdaccio/verdaccio + curl http://0.0.0.0:4873/ npm adduser --registry http://0.0.0.0:4873/ npm publish --registry http://0.0.0.0:4873/ From 08240111b719b4fdda9d36b5fb43ff7efa10e554 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 13:47:12 -0700 Subject: [PATCH 205/417] CI/CD Improvements --- .github/workflows/npm-install-script-test.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 5ab31c5e4..3c01db20e 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -164,12 +164,16 @@ jobs: - name: Change install command for release run: node ./scripts/change-install-command.js - - name: verdaccio server run - run: | - docker run --rm -d --name verdaccio -p 4873:4873 verdaccio/verdaccio - curl http://0.0.0.0:4873/ - npm adduser --registry http://0.0.0.0:4873/ - npm publish --registry http://0.0.0.0:4873/ + + - name: run install command + run: npm install + + #- name: verdaccio server run + # run: | + # docker run --rm -d --name verdaccio -p 4873:4873 verdaccio/verdaccio + # curl http://0.0.0.0:4873/ + # npm adduser --registry http://0.0.0.0:4873/ + # npm publish --registry http://0.0.0.0:4873/ #- name: List available artifacts # run: ls ./lib/binding || echo "No artifacts found in binding" \ No newline at end of file From 44f8b53f358a56b37bc10e31901e19f5dc7d7cae Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 13:53:13 -0700 Subject: [PATCH 206/417] CI/CD Improvements --- .github/workflows/build-bindings.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 1527ee8fe..cecfa7971 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -266,6 +266,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; + npx tsc; npm run test dist/${{ inputs.test-file }} -- --h 172.17.0.2 --port 3000 --U superuser --P superuser; - name: Run tests @@ -277,6 +278,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; + npx tsc; npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --t 15000 --U superuser --P superuser; # NEED TO MAKE A NODEJS ACTION WHICH REPLACES THIS!!! @@ -297,9 +299,6 @@ jobs: # CIBW_TEST_COMMAND: ${{ env.TEST_COMMAND }} # - - name: Run tests - run: | - ls ./lib/binding; - name: Upload wheels to GitHub Linux x86 uses: actions/upload-artifact@v4 @@ -537,6 +536,7 @@ jobs: cd ..; npm install; pwd; + npx tsc; npm run test dist/${{ inputs.test-file }} -- --h localhost --port 3000 --U superuser --P superuser; @@ -553,9 +553,10 @@ jobs: npm i --save-dev @types/mocha; npm install mocha; npx tsc; - cp tests\udf.lua dist\udf.lua ; + cp tests\udf.lua dist\udf.lua; npx mocha dist -- --h ${env:DOCKER_HOST_IP} --port 3000 --U superuser --P superuser; cd ..; + npx tsc; - name: Show job status for commit From 1497a9497acf30721afc96fbd3586b34a448e11a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 14:02:14 -0700 Subject: [PATCH 207/417] CI/CD Improvements --- .github/workflows/tests.yml | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a9ba295b..eb67a36c6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -399,6 +399,54 @@ jobs: - name: Run tests run: npm run valgrind -- --t 40000 + test-tsc-compile: + runs-on: ubuntu-latest + needs: build-ubuntu + strategy: + matrix: + node-version: [ + "20", + ] + fail-fast: false + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + architecture: 'x64' + + - uses: actions/download-artifact@v4 + with: + name: binding-${{ matrix.node-version }} + + - name: make binding folder + run: mkdir lib/binding + + - name: install mocha + run: npm install mocha + + - name: install valgrind + run: | + sudo apt-get update; + sudo apt update; + sudo apt install valgrind; + + - name: Install client + #fix the convention here + run: | + npx tsc; + npx tsc typings/index.d.ts; + cd ts-test; + npx tsc; + + - name: Wait for database to be ready + # Should be ready after 3 seconds + run: sleep 3 + # test-typescript: # runs-on: ubuntu-latest # needs: build-ubuntu From d89fee6373c1cdff48a8c45065b795a5b334ce59 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 14:04:17 -0700 Subject: [PATCH 208/417] CI/CD Improvements --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a9ba295b..4ac69b8ed 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -399,6 +399,7 @@ jobs: - name: Run tests run: npm run valgrind -- --t 40000 + # test-typescript: # runs-on: ubuntu-latest # needs: build-ubuntu From 3b1bbb577e1affac60ca8c487eedd5de08665622 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 10 Jan 2025 14:16:46 -0700 Subject: [PATCH 209/417] CI/CD Improvements --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eb67a36c6..0bd2cfbc1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -435,12 +435,18 @@ jobs: sudo apt update; sudo apt install valgrind; + - name: Install client + #fix the convention here + run: | + cp -r node-v115-linux-x64 lib/binding/node-v115-linux-x64 + - name: Install client #fix the convention here run: | npx tsc; npx tsc typings/index.d.ts; cd ts-test; + npm install .. npx tsc; - name: Wait for database to be ready From 19cf588fc58884aeca2834efba3e2017616682bc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 07:25:34 -0700 Subject: [PATCH 210/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 1 - .github/workflows/build-bindings.yml | 1 - .github/workflows/dev-workflow-p1.yml | 12 ++++++------ .github/workflows/dev-workflow-p2.yml | 20 ++++++++++---------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 8a90cae06..b7f9f6127 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -88,7 +88,6 @@ jobs: "manylinux_x86_64", "manylinux_aarch64", "macosx_x86_64", - "macosx_arm64", "win_amd64" ] fail-fast: false diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index cecfa7971..6ccc06fa9 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -36,7 +36,6 @@ on: - manylinux_x86_64 - manylinux_aarch64 - macosx_x86_64 - - macosx_arm64 - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 8e90900c7..6d26a3bec 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -27,12 +27,12 @@ on: default: false jobs: - test-with-server-release: - uses: ./.github/workflows/build-artifacts.yml - with: - run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} - sha-to-build-and-test: ${{ github.sha }} - secrets: inherit +# test-with-server-release: +# uses: ./.github/workflows/build-artifacts.yml +# with: +# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} +# sha-to-build-and-test: ${{ github.sha }} +# secrets: inherit # test-with-server-rc: # needs: test-with-server-release diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index ef4eec3c3..fc53b0fb2 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -13,18 +13,18 @@ on: - 'package.json' jobs: -# bump-dev-number: -# #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} -# uses: ./.github/workflows/bump-version.yml -# with: -# change: 'bump-dev-num' -# secrets: inherit - - release-package: - name: release npm package - uses: ./.github/workflows/release-package.yml + bump-dev-number: + #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} + uses: ./.github/workflows/bump-version.yml + with: + change: 'bump-dev-num' secrets: inherit +# release-package: +# name: release npm package +# uses: ./.github/workflows/release-package.yml +# secrets: inherit + # rebuild-artifacts-with-new-dev-num: # needs: bump-dev-number # name: Rebuild artifacts with new dev number From 344e3d1de57129daf4b1ea1fa74b801a71446c2e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 07:42:47 -0700 Subject: [PATCH 211/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 52 +++++++++++++-------------- .github/workflows/upload-to-jfrog.yml | 8 ++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index fc53b0fb2..df1a0841e 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -13,44 +13,44 @@ on: - 'package.json' jobs: - bump-dev-number: +# bump-dev-number: #if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }} - uses: ./.github/workflows/bump-version.yml - with: - change: 'bump-dev-num' - secrets: inherit +# uses: ./.github/workflows/bump-version.yml +# with: +# change: 'bump-dev-num' +# secrets: inherit # release-package: # name: release npm package # uses: ./.github/workflows/release-package.yml # secrets: inherit -# rebuild-artifacts-with-new-dev-num: -# needs: bump-dev-number -# name: Rebuild artifacts with new dev number -# uses: ./.github/workflows/build-artifacts.yml -# with: -# # On pull_request_target, the bump version commit will be ignored -# # So we must pass it manually to the workflow -# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} -# secrets: inherit -# + rebuild-artifacts-with-new-dev-num: + needs: bump-dev-number + name: Rebuild artifacts with new dev number + uses: ./.github/workflows/build-artifacts.yml + with: + # On pull_request_target, the bump version commit will be ignored + # So we must pass it manually to the workflow + sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} + secrets: inherit + # test-npm-install: # needs: rebuild-artifacts-with-new-dev-num # name: Test npm install command for npm package # uses: ./.github/workflows/npm-install-script-test.yml -# upload-to-jfrog: -# name: Upload artifacts to JFrog -# needs: [ -# bump-dev-number, -# rebuild-artifacts-with-new-dev-num -# ] -# uses: ./.github/workflows/upload-to-jfrog.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit -# + upload-to-jfrog: + name: Upload artifacts to JFrog + #needs: [ + # bump-dev-number, + # rebuild-artifacts-with-new-dev-num + #] + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit + # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: # needs: upload-to-jfrog diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 5de0ada8a..cc98bc5cf 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -45,8 +45,8 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number $NEW_VERSION "artifacts/*" ${{ vars.JFROG_REPO_NAME }}/aerospike/$NEW_VERSION/ env: - NEW_VERSION: ${{ inputs.version }} + NEW_VERSION: 6.0.3-dev.1 - - name: Publish build info - if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client ${{ inputs.version }} + #- name: Publish build info + # if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} + # run: jf rt build-publish nodejs-client ${{ inputs.version }} From adceb43e8eabd4dd70995b7d17587bd9b895d309 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 07:46:44 -0700 Subject: [PATCH 212/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index df1a0841e..ae1bc999d 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -26,7 +26,7 @@ jobs: # secrets: inherit rebuild-artifacts-with-new-dev-num: - needs: bump-dev-number + #needs: bump-dev-number name: Rebuild artifacts with new dev number uses: ./.github/workflows/build-artifacts.yml with: From 85343e5df64de995f7f64fb9cb1501e708fc1b4e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 07:49:36 -0700 Subject: [PATCH 213/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 9 +++++---- .github/workflows/build-bindings.yml | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index b7f9f6127..0c819fd58 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -85,10 +85,11 @@ jobs: strategy: matrix: platform-tag: [ - "manylinux_x86_64", - "manylinux_aarch64", - "macosx_x86_64", - "win_amd64" + #"manylinux_x86_64", + #"manylinux_aarch64", + #"macosx_x86_64", + #"macosx_arm64", + #"win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 6ccc06fa9..db79f81e4 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -34,9 +34,10 @@ on: required: true options: - manylinux_x86_64 - - manylinux_aarch64 - - macosx_x86_64 - - win_amd64 + #- manylinux_aarch64 + #- macosx_x86_64 + #- macosx_arm64 + #- win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: From 90131bdf7323c54ab8be0c6b211090a36f259cd8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 07:50:43 -0700 Subject: [PATCH 214/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 0c819fd58..353b4599a 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -85,7 +85,7 @@ jobs: strategy: matrix: platform-tag: [ - #"manylinux_x86_64", + "manylinux_x86_64", #"manylinux_aarch64", #"macosx_x86_64", #"macosx_arm64", From 1dc97ae80dad5c99e165498883af766affa79139 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 07:52:40 -0700 Subject: [PATCH 215/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index ae1bc999d..c0c795d4e 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -42,10 +42,10 @@ jobs: upload-to-jfrog: name: Upload artifacts to JFrog - #needs: [ + needs: [ # bump-dev-number, - # rebuild-artifacts-with-new-dev-num - #] + rebuild-artifacts-with-new-dev-num + ] uses: ./.github/workflows/upload-to-jfrog.yml with: version: ${{ needs.bump-dev-number.outputs.new_version }} From 3f3c9bdeae08246eb4b3a7f2fa0672e6aef128d5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 08:43:50 -0700 Subject: [PATCH 216/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index cc98bc5cf..8027e7584 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -29,21 +29,21 @@ jobs: path: artifacts - name: Set up JFrog credentials - uses: jfrog/setup-jfrog-cli@v3 + uses: jfrog/setup-jfrog-cli@v4 env: JF_URL: ${{ secrets.JFROG_PLATFORM_URL }} JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }} - - name: Upload manylinux builds from arbitrary branches to JFrog generic repo - if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} - run: jf rt upload "*manylinux*" ${{ vars.JFROG_GENERIC_REPO_NAME }}/${{ github.ref_name }}/ - working-directory: artifacts + #- name: Upload manylinux builds from arbitrary branches to JFrog generic repo + # if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} + # run: jf rt upload "*manylinux*" jfrog-pipelines-nodejs + # working-directory: artifacts - name: Upload passing builds to JFrog Nodejs repo if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} # Source path must be in quotes if it contains an asterisk # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 - run: jf rt upload --build-name nodejs-client --build-number $NEW_VERSION "artifacts/*" ${{ vars.JFROG_REPO_NAME }}/aerospike/$NEW_VERSION/ + run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" jfrog-pipelines-nodejsaerospike/${{ env.NEW_VERSION }}/ env: NEW_VERSION: 6.0.3-dev.1 From f8549474acb5e70bc4b8044e0ef651f4f0319307 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 08:50:29 -0700 Subject: [PATCH 217/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 8027e7584..25e48387f 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -43,7 +43,7 @@ jobs: if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} # Source path must be in quotes if it contains an asterisk # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 - run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" jfrog-pipelines-nodejsaerospike/${{ env.NEW_VERSION }}/ + run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" jfrog-pipelines-nodejs/aerospike/${{ env.NEW_VERSION }}/ env: NEW_VERSION: 6.0.3-dev.1 From 657010b28d02d9a94e657f6d98600222cf97d6f7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 13 Jan 2025 09:06:34 -0700 Subject: [PATCH 218/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 25e48387f..d4a5968fb 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -49,4 +49,4 @@ jobs: #- name: Publish build info # if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - # run: jf rt build-publish nodejs-client ${{ inputs.version }} + # run: jf rt build-publish nodejs-client ${{ inputs.version }} \ No newline at end of file From bd55d928b531aac253094c6e71a7800c11e62a05 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 09:18:47 -0700 Subject: [PATCH 219/417] CI/CD enginerring --- .../get-artifact-for-stage-tests/action.yml | 3 --- .../workflows/bump-stage-and-upload-to-jfrog.yml | 2 -- .github/workflows/upload-to-jfrog.yml | 16 ++++++++++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/actions/get-artifact-for-stage-tests/action.yml b/.github/actions/get-artifact-for-stage-tests/action.yml index 8b91fa5ea..79b1c5eb3 100644 --- a/.github/actions/get-artifact-for-stage-tests/action.yml +++ b/.github/actions/get-artifact-for-stage-tests/action.yml @@ -21,8 +21,6 @@ inputs: # Secrets JFROG_PLATFORM_URL: required: false - JFROG_ACCESS_TOKEN: - required: false # Variables JFROG_REPO_NAME: required: false @@ -74,7 +72,6 @@ runs: if: ${{ inputs.get_from_jfrog == 'true' }} env: JF_URL: ${{ inputs.JFROG_PLATFORM_URL }} - JF_ACCESS_TOKEN: ${{ inputs.JFROG_ACCESS_TOKEN }} - name: Download artifact from JFrog if: ${{ inputs.get_from_jfrog == 'true' }} diff --git a/.github/workflows/bump-stage-and-upload-to-jfrog.yml b/.github/workflows/bump-stage-and-upload-to-jfrog.yml index 922c94de9..502fc0a02 100644 --- a/.github/workflows/bump-stage-and-upload-to-jfrog.yml +++ b/.github/workflows/bump-stage-and-upload-to-jfrog.yml @@ -12,8 +12,6 @@ on: # Used to upload to JFrog JFROG_PLATFORM_URL: required: true - JFROG_ACCESS_TOKEN: - required: true jobs: ff-stage-to-dev-tag: diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index d4a5968fb..b23735081 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -13,8 +13,14 @@ on: secrets: JFROG_PLATFORM_URL: required: true - JFROG_ACCESS_TOKEN: - required: true + oidc-provider: + description: "" + required: false + default: gh-aerospike-clients + oidc-audience: + description: "" + required: false + default: aerospike/clients jobs: upload-to-jfrog: @@ -32,8 +38,10 @@ jobs: uses: jfrog/setup-jfrog-cli@v4 env: JF_URL: ${{ secrets.JFROG_PLATFORM_URL }} - JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }} - + with: + oidc-provider-name: ${{ inputs.oidc-provider }} + oidc-audience: ${{ inputs.oidc-audience }} + #- name: Upload manylinux builds from arbitrary branches to JFrog generic repo # if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} # run: jf rt upload "*manylinux*" jfrog-pipelines-nodejs From ee25971bd8ccdd8158de50fa26826bad51357e74 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 09:26:19 -0700 Subject: [PATCH 220/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index b23735081..563f3c5bb 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -10,9 +10,6 @@ on: type: string required: false default: ${{ vars.JFROG_REPO_NAME }} - secrets: - JFROG_PLATFORM_URL: - required: true oidc-provider: description: "" required: false @@ -21,6 +18,9 @@ on: description: "" required: false default: aerospike/clients + secrets: + JFROG_PLATFORM_URL: + required: true jobs: upload-to-jfrog: @@ -41,7 +41,7 @@ jobs: with: oidc-provider-name: ${{ inputs.oidc-provider }} oidc-audience: ${{ inputs.oidc-audience }} - + #- name: Upload manylinux builds from arbitrary branches to JFrog generic repo # if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} # run: jf rt upload "*manylinux*" jfrog-pipelines-nodejs From c076131e6901bd6d5b37bdd92d051d3b824f454e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 09:36:00 -0700 Subject: [PATCH 221/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 563f3c5bb..7049f77cd 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -11,10 +11,12 @@ on: required: false default: ${{ vars.JFROG_REPO_NAME }} oidc-provider: + type: string description: "" required: false default: gh-aerospike-clients oidc-audience: + type: string description: "" required: false default: aerospike/clients From b66f2cbe67f8c119261c8eadfd374d73c0968487 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 09:54:09 -0700 Subject: [PATCH 222/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 7049f77cd..399976b41 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -10,16 +10,16 @@ on: type: string required: false default: ${{ vars.JFROG_REPO_NAME }} - oidc-provider: - type: string - description: "" - required: false - default: gh-aerospike-clients - oidc-audience: - type: string - description: "" - required: false - default: aerospike/clients + #oidc-provider: + # type: string + # description: "" + # required: false + # default: gh-aerospike-clients + #oidc-audience: + # type: string + # description: "" + # required: false + # default: aerospike/clients secrets: JFROG_PLATFORM_URL: required: true @@ -41,8 +41,8 @@ jobs: env: JF_URL: ${{ secrets.JFROG_PLATFORM_URL }} with: - oidc-provider-name: ${{ inputs.oidc-provider }} - oidc-audience: ${{ inputs.oidc-audience }} + oidc-provider-name: gh-aerospike-clients + oidc-audience: aerospike/clients #- name: Upload manylinux builds from arbitrary branches to JFrog generic repo # if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} From 61f2a72aed203e35dfb4a3a491babce3557f71d7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 09:57:57 -0700 Subject: [PATCH 223/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 399976b41..6a26b5adf 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -1,5 +1,9 @@ name: Upload to JFrog +permissions: + # This is required for requesting the OIDC token + id-token: write + on: workflow_call: inputs: From a62687693aba43bd04e1cdb86dadf92799cdf630 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 11:07:41 -0700 Subject: [PATCH 224/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 6a26b5adf..37a175606 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -3,7 +3,7 @@ name: Upload to JFrog permissions: # This is required for requesting the OIDC token id-token: write - + on: workflow_call: inputs: @@ -41,7 +41,7 @@ jobs: path: artifacts - name: Set up JFrog credentials - uses: jfrog/setup-jfrog-cli@v4 + uses: jfrog/setup-jfrog-cli@v4.4.2 env: JF_URL: ${{ secrets.JFROG_PLATFORM_URL }} with: From d69830761f51b711a57eef475845b3ee78b2f05b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 11:15:54 -0700 Subject: [PATCH 225/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 37a175606..b87414a7d 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -41,7 +41,7 @@ jobs: path: artifacts - name: Set up JFrog credentials - uses: jfrog/setup-jfrog-cli@v4.4.2 + uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 env: JF_URL: ${{ secrets.JFROG_PLATFORM_URL }} with: From 6eb8720a4eac97626c903369089f27a61407135e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 11:25:02 -0700 Subject: [PATCH 226/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index b87414a7d..e7930fe4b 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -43,10 +43,10 @@ jobs: - name: Set up JFrog credentials uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 env: - JF_URL: ${{ secrets.JFROG_PLATFORM_URL }} + JF_URL: https://aerospike.jfrog.io with: - oidc-provider-name: gh-aerospike-clients - oidc-audience: aerospike/clients + oidc-provider-name: gh-aerospike-clients + oidc-audience: aerospike/clients #- name: Upload manylinux builds from arbitrary branches to JFrog generic repo # if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} From 1d002193e4b9007528e4607d20a15921f81b064e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 13:00:36 -0700 Subject: [PATCH 227/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index e7930fe4b..1e740f0f0 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -57,9 +57,10 @@ jobs: if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} # Source path must be in quotes if it contains an asterisk # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 - run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" jfrog-pipelines-nodejs/aerospike/${{ env.NEW_VERSION }}/ + run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: NEW_VERSION: 6.0.3-dev.1 + PACKAGE_MANAGER: npm #- name: Publish build info # if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} From fa4bf0f51181fd7e5f85463c8a73de1d68908db7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 15:12:10 -0700 Subject: [PATCH 228/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 1e740f0f0..ef1eaf507 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -48,6 +48,7 @@ jobs: oidc-provider-name: gh-aerospike-clients oidc-audience: aerospike/clients + #- name: Upload manylinux builds from arbitrary branches to JFrog generic repo # if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} # run: jf rt upload "*manylinux*" jfrog-pipelines-nodejs From c7147807453291028d9701638bfc0ecc20b70f38 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 15:18:51 -0700 Subject: [PATCH 229/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index c0c795d4e..9f57352c7 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -49,7 +49,7 @@ jobs: uses: ./.github/workflows/upload-to-jfrog.yml with: version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit + #secrets: inherit # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: From 27bb8f961d41169ee5f61f2eb9ec96da4d95c0f7 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 15:19:46 -0700 Subject: [PATCH 230/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index ef1eaf507..f8287f7f7 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -24,9 +24,9 @@ on: # description: "" # required: false # default: aerospike/clients - secrets: - JFROG_PLATFORM_URL: - required: true + #secrets: + # JFROG_PLATFORM_URL: + # required: true jobs: upload-to-jfrog: From 90ac62ae1f481733583b9ab0fb0c913ef486deac Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 15:40:24 -0700 Subject: [PATCH 231/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index f8287f7f7..08a9a0f6a 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -54,6 +54,9 @@ jobs: # run: jf rt upload "*manylinux*" jfrog-pipelines-nodejs # working-directory: artifacts + - name: WHOAMI + - run: jf rt whoami + - name: Upload passing builds to JFrog Nodejs repo if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} # Source path must be in quotes if it contains an asterisk From cdc93aa251bda038650f716af200bda724794c35 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 15:40:56 -0700 Subject: [PATCH 232/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 08a9a0f6a..899fd6af4 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -55,7 +55,7 @@ jobs: # working-directory: artifacts - name: WHOAMI - - run: jf rt whoami + run: jf rt whoami - name: Upload passing builds to JFrog Nodejs repo if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} From 6f822346a59c1e4be0416d78fa9b33a27fd6e0e3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 15:42:12 -0700 Subject: [PATCH 233/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 899fd6af4..917d886bd 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -55,7 +55,7 @@ jobs: # working-directory: artifacts - name: WHOAMI - run: jf rt whoami + run: jf config show - name: Upload passing builds to JFrog Nodejs repo if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} From edbc2c06a818f3a4f6768e5238fadfeba1e2f284 Mon Sep 17 00:00:00 2001 From: Sean Kilgore Date: Wed, 15 Jan 2025 15:23:22 -0800 Subject: [PATCH 234/417] testing oidc integration, based on last committer ? --- .github/workflows/upload-to-jfrog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 917d886bd..956a60d0f 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -54,7 +54,7 @@ jobs: # run: jf rt upload "*manylinux*" jfrog-pipelines-nodejs # working-directory: artifacts - - name: WHOAMI + - name: WHOAMI REALLY run: jf config show - name: Upload passing builds to JFrog Nodejs repo From bc252d506a8f28559d480dc9f85cf06b4cad643e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 15 Jan 2025 16:38:51 -0700 Subject: [PATCH 235/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 917d886bd..ecb76ee5c 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -48,7 +48,6 @@ jobs: oidc-provider-name: gh-aerospike-clients oidc-audience: aerospike/clients - #- name: Upload manylinux builds from arbitrary branches to JFrog generic repo # if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }} # run: jf rt upload "*manylinux*" jfrog-pipelines-nodejs From a8fdf7c6b8bd0ad441fc8c51b24b8dd837c4f8e9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 16 Jan 2025 00:30:41 -0700 Subject: [PATCH 236/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index ecb76ee5c..098a2f745 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -62,9 +62,9 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.1 + NEW_VERSION: 6.0.3-dev.2 PACKAGE_MANAGER: npm - #- name: Publish build info - # if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - # run: jf rt build-publish nodejs-client ${{ inputs.version }} \ No newline at end of file + - name: Publish build info + if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} + run: jf rt build-publish nodejs-client 6.0.3-dev.2 \ No newline at end of file From f7a9b256ac7496e6a781682b7d0c3b1e2e0fb95d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 16 Jan 2025 03:54:32 -0700 Subject: [PATCH 237/417] Added changes for 7.0.0 release. --- .gitmodules | 2 +- aerospike-client-c | 2 +- lib/abort_status.js | 1 - lib/client.js | 19 +- lib/commit_status.js | 1 - lib/status.js | 123 +++-- package-lock.json | 1 + package.json | 2 +- src/main/enums/abort_status.cc | 1 - src/main/enums/commit_status.cc | 1 - src/main/enums/status.cc | 9 +- ts-test/package-lock.json | 356 ++++++++++++- ts-test/package.json | 1 + ts-test/tests/error.ts | 2 +- ts-test/tests/mrt_api.ts | 38 ++ ts-test/tests/mrt_backward_compatible.ts | 5 +- ts-test/tests/mrt_functionality.ts | 18 +- ts-test/tests/status.ts | 623 +++++++++++++++++++++++ ts-test/tests/test_helper.ts | 4 - typings/index.d.ts | 58 ++- 20 files changed, 1195 insertions(+), 72 deletions(-) create mode 100644 ts-test/tests/status.ts diff --git a/.gitmodules b/.gitmodules index fdf1dc411..be8c9ebcd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "aerospike-client-c"] path = aerospike-client-c url = https://github.com/aerospike/aerospike-client-c.git - branch = master + branch = stage diff --git a/aerospike-client-c b/aerospike-client-c index 22525aad6..eaab4eb06 160000 --- a/aerospike-client-c +++ b/aerospike-client-c @@ -1 +1 @@ -Subproject commit 22525aad6daa10c1491175bd0b2bc301a70997c9 +Subproject commit eaab4eb0616fbb24aa0efecf1ea0f0b3427cff16 diff --git a/lib/abort_status.js b/lib/abort_status.js index a647ef1e0..cfb544145 100644 --- a/lib/abort_status.js +++ b/lib/abort_status.js @@ -21,7 +21,6 @@ const abortStatus = as.abortStatus module.exports = { OK: abortStatus.OK, - ALREADY_COMMITTED: abortStatus.ALREADY_COMMITTED, ALREADY_ABORTED: abortStatus.ALREADY_ABORTED, ROLL_BACK_ABANDONED: abortStatus.ROLL_BACK_ABANDONED, CLOSE_ABANDONED: abortStatus.CLOSE_ABANDONED diff --git a/lib/client.js b/lib/client.js index c5c4b736e..f41ec30be 100644 --- a/lib/client.js +++ b/lib/client.js @@ -22,8 +22,7 @@ const EventEmitter = require('events') const as = require('bindings')('aerospike.node') const AerospikeError = require('./error') -const abortStatus = require('./abort_status') -const commitStatus = require('./commit_status') +const status = require('./status') const txnState = require('./txn_state') const Transaction = require('./transaction') const Context = require('./cdt_context') @@ -220,9 +219,13 @@ Client.prototype.abort = function (transaction, callback) { _transactionPool.tendTransactions() if (transaction instanceof Transaction) { if (transaction.getState() === txnState.COMMITTED) { - return abortStatus.ALREADY_COMMITTED + const err = new AerospikeError('The transaction has already been committed.') + err.code = status.TXN_ALREADY_COMMITTED + throw err } else if (transaction.getState() === txnState.ABORTED) { - return abortStatus.ALREADY_ABORTED + const err = new AerospikeError('The transaction has already been aborted.') + err.code = status.TXN_ALREADY_ABORTED + throw err } else if (transaction.getDestroyed() === true) { throw new AerospikeError('The object has been destroyed, please create a new transaction.') } @@ -237,9 +240,13 @@ Client.prototype.commit = function (transaction, callback) { _transactionPool.tendTransactions() if (transaction instanceof Transaction) { if (transaction.getState() === txnState.COMMITTED) { - return commitStatus.ALREADY_COMMITTED + const err = new AerospikeError('The transaction has already been committed.') + err.code = status.TXN_ALREADY_COMMITTED + throw err } else if (transaction.getState() === txnState.ABORTED) { - return commitStatus.ALREADY_ABORTED + const err = new AerospikeError('The transaction has already been aborted.') + err.code = status.TXN_ALREADY_ABORTED + throw err } else if (transaction.getDestroyed() === true) { throw new AerospikeError('The object has been destroyed, please create a new transaction.') } diff --git a/lib/commit_status.js b/lib/commit_status.js index 5c39a528d..261b09b00 100644 --- a/lib/commit_status.js +++ b/lib/commit_status.js @@ -22,7 +22,6 @@ const commitStatus = as.commitStatus module.exports = { OK: commitStatus.OK, ALREADY_COMMITTED: commitStatus.ALREADY_COMMITTED, - ALREADY_ABORTED: commitStatus.ALREADY_ABORTED, VERIFY_FAILED: commitStatus.VERIFY_FAILED, MARK_ROLL_FORWARD_ABANDONED: commitStatus.MARK_ROLL_FORWARD_ABANDONED, ROLL_FORWARD_ABANDONED: commitStatus.ROLL_FORWARD_ABANDONED, diff --git a/lib/status.js b/lib/status.js index 82e6beec5..4abd61bad 100644 --- a/lib/status.js +++ b/lib/status.js @@ -24,6 +24,10 @@ const as = require('bindings')('aerospike.node') * @description Database operation error codes. */ +exports.TXN_ALREADY_ABORTED = exports.AEROSPIKE_TXN_ALREADY_ABORTED = as.status.AEROSPIKE_TXN_ALREADY_ABORTED + +exports.TXN_ALREADY_COMMITTED = exports.AEROSPIKE_TXN_ALREADY_COMMITTED = as.status.AEROSPIKE_TXN_ALREADY_COMMITTED + /** * Multi-record transaction failed. * @const {number} @@ -443,6 +447,10 @@ exports.NOT_AUTHENTICATED = exports.AEROSPIKE_NOT_AUTHENTICATED = as.status.AERO */ exports.ROLE_VIOLATION = exports.AEROSPIKE_ROLE_VIOLATION = as.status.AEROSPIKE_ROLE_VIOLATION +exports.NOT_WHITELISTED = exports.AEROSPIKE_NOT_WHITELISTED = as.status.AEROSPIKE_NOT_WHITELISTED + +exports.QUOTA_EXCEEDED = exports.AEROSPIKE_QUOTA_EXCEEDED = as.status.AEROSPIKE_QUOTA_EXCEEDED + /** * Generic UDF error. * @const {number} @@ -455,6 +463,8 @@ exports.MRT_EXPIRED = exports.AEROSPIKE_MRT_EXPIRED = as.status.AEROSPIKE_MRT_EX exports.MRT_TOO_MANY_WRITES = exports.AEROSPIKE_MRT_TOO_MANY_WRITES = as.status.AEROSPIKE_MRT_TOO_MANY_WRITES exports.MRT_COMMITTED = exports.AEROSPIKE_MRT_COMMITTED = as.status.AEROSPIKE_MRT_COMMITTED exports.MRT_ABORTED = exports.AEROSPIKE_MRT_ABORTED = as.status.AEROSPIKE_MRT_ABORTED +exports.MRT_ALREADY_LOCKED = exports.AEROSPIKE_MRT_ALREADY_LOCKED = as.status.AEROSPIKE_MRT_ALREADY_LOCKED +exports.MRT_MONITOR_EXISTS = exports.AEROSPIKE_MRT_MONITOR_EXISTS = as.status.AEROSPIKE_MRT_MONITOR_EXISTS /** * Batch functionality has been disabled. @@ -568,14 +578,44 @@ exports.ERR_LUA_FILE_NOT_FOUND = exports.AEROSPIKE_ERR_LUA_FILE_NOT_FOUND = as.s exports.getMessage = function (code) { /* istanbul ignore next */ switch (code) { + case exports.TXN_ALREADY_ABORTED: + return 'Transaction commit called, but the transaction was already aborted.' + + case exports.TXN_ALREADY_COMMITTED: + return 'Transaction abort called, but the transaction was already committed.' + case exports.TXN_FAILED: - return 'Multi-record transaction failed.' + return 'Transaction failed.' + + case exports.BATCH_FAILED: + return 'One or more keys failed in a batch.' + + case exports.NO_RESPONSE: + return 'No response received from server.' + + case exports.MAX_ERROR_RATE: + return 'Max errors limit reached.' + + case exports.USE_NORMAL_RETRY: + return 'Abort split batch retry and use normal node retry instead. Used internally and should not be returned to user.' + + case exports.ERR_MAX_RETRIES_EXCEEDED: + return 'Max retries limit reached.' + + case exports.ERR_ASYNC_QUEUE_FULL: + return 'Async command delay queue is full.' + + case exports.ERR_CONNECTION: + return 'Synchronous connection error.' + + case exports.ERR_TLS_ERROR: + return 'TLS related error' case exports.ERR_INVALID_NODE: return 'Node invalid or could not be found.' case exports.ERR_NO_MORE_CONNECTIONS: - return 'Asynchronous connection error.' + return 'Max connections would be exceeded.' case exports.ERR_ASYNC_CONNECTION: return 'Asynchronous connection error.' @@ -599,10 +639,10 @@ exports.getMessage = function (code) { return 'Generic success.' case exports.ERR_SERVER: - return 'Generic error returned by the server.' + return 'Generic error returned by server.' case exports.ERR_RECORD_NOT_FOUND: - return 'Record does not exist in database. May be returned by read, or write with policy Aerospike.policy.exists.UPDATE' + return 'Record does not exist in database. May be returned by read, or write with policy Aerospike.policy.exists.UPDATE.' case exports.ERR_RECORD_GENERATION: return 'Generation of record in database does not satisfy write policy.' @@ -617,7 +657,7 @@ exports.getMessage = function (code) { return 'Bin already exists on a create-only operation.' case exports.ERR_CLUSTER_CHANGE: - return 'A cluster state change occurred during the request.' + return 'A cluster state change occurred during the request. This may also be returned by scan operations with the fail_on_cluster_change flag set.' case exports.ERR_SERVER_FULL: return 'The server node is running out of memory and/or storage device space reserved for the specified namespace.' @@ -626,25 +666,25 @@ exports.getMessage = function (code) { return 'Request timed out. Can be triggered by client or server.' case exports.ERR_ALWAYS_FORBIDDEN: - return 'Client is attempting an operation which is not allowed under current configuration.' + return 'Operation not allowed in current configuration.' case exports.ERR_CLUSTER: return 'Partition is unavailable.' case exports.ERR_BIN_INCOMPATIBLE_TYPE: - return 'Bin modification operation cannot be done on an existing bin due to its value type.' + return 'Bin modification operation can\'t be done on an existing bin due to its value type.' case exports.ERR_RECORD_TOO_BIG: - return 'Record being (re-)written cannot fit in a storage write block.' + return 'Record being (re-)written can\'t fit in a storage write block.' case exports.ERR_RECORD_BUSY: - return 'Too many concurrent requests for one record - a "hot key" situation.' + return 'Too many concurrent requests for one record - a "hot-key" situation.' case exports.ERR_SCAN_ABORTED: return 'Scan aborted by user.' case exports.ERR_UNSUPPORTED_FEATURE: - return 'Sometimes our doc, or our customers\' wishes, get ahead of us. We may have processed something that the server is not ready for (unsupported feature).' + return 'Sometimes our doc, or our customers wishes, get ahead of us. We may have processed something that the server is not ready for (unsupported feature).' case exports.ERR_BIN_NOT_FOUND: return 'Bin not found on update-only operation.' @@ -653,22 +693,22 @@ exports.getMessage = function (code) { return 'The server node\'s storage device(s) can\'t keep up with the write load.' case exports.ERR_RECORD_KEY_MISMATCH: - return 'Record key sent with transaction did not match key stored on server.' + return 'Record key sent with command did not match key stored on server.' case exports.ERR_NAMESPACE_NOT_FOUND: return 'Namespace in request not found on server.' case exports.ERR_BIN_NAME: - return 'Sent too-long bin name or exceeded namespace\'s bin name quota.' + return 'Sent too-long bin name (should be impossible in this client) or exceeded namespace\'s bin name quota.' case exports.ERR_FAIL_FORBIDDEN: return 'Operation not allowed at this time.' case exports.ERR_FAIL_ELEMENT_NOT_FOUND: - return 'Map/list element not found in UPDATE_ONLY write mode.' + return 'Map element not found in UPDATE_ONLY write mode.' case exports.ERR_FAIL_ELEMENT_EXISTS: - return 'Map/list element exists in CREATE_ONLY write mode.' + return 'Map element exists in CREATE_ONLY write mode.' case exports.ERR_ENTERPRISE_ONLY: return 'Attempt to use an Enterprise feature on a Community server or a server without the applicable feature key.' @@ -677,7 +717,13 @@ exports.getMessage = function (code) { return 'The operation cannot be applied to the current bin value on the server.' case exports.FILTERED_OUT: - return 'The transaction was not performed because the expression was false.' + return 'The command was not performed because the filter expression was false.' + + case exports.LOST_CONFLICT: + return 'Write command loses conflict to XDR.' + + case exports.XDR_KEY_BUSY: + return 'Write can\'t complete until XDR finishes shipping.' case exports.QUERY_END: return 'There are no more records left for query.' @@ -689,7 +735,7 @@ exports.getMessage = function (code) { return 'Security functionality not enabled by connected server.' case exports.SECURITY_SCHEME_NOT_SUPPORTED: - return 'Security type not supported by connected server.' + return 'Security scheme not supported.' case exports.INVALID_COMMAND: return 'Administration command is invalid.' @@ -718,23 +764,26 @@ exports.getMessage = function (code) { case exports.INVALID_CREDENTIAL: return 'Security credential is invalid.' + case exports.EXPIRED_SESSION: + return 'Login session expired.' + case exports.INVALID_ROLE: return 'Role name is invalid.' case exports.ROLE_ALREADY_EXISTS: - return 'Role name already exists.' + return 'Role already exists.' case exports.INVALID_PRIVILEGE: return 'Privilege is invalid.' case exports.INVALID_WHITELIST: - return 'Specified IP whitelist is invalid.' + return 'Invalid IP whitelist.' case exports.QUOTAS_NOT_ENABLED: - return 'Quotas not enabled on the server.' + return 'Quotas not enabled on server.' case exports.INVALID_QUOTA: - return 'Invalid quota specified.' + return 'Invalid quota.' case exports.NOT_AUTHENTICATED: return 'User must be authenticated before performing database operations.' @@ -742,38 +791,50 @@ exports.getMessage = function (code) { case exports.ROLE_VIOLATION: return 'User does not possess the required role to perform the database operation.' + case exports.NOT_WHITELISTED: + return 'Command not allowed because sender IP not whitelisted.' + + case exports.QUOTA_EXCEEDED: + return 'Quota exceeded.' + case exports.ERR_UDF: return 'Generic UDF error.' case exports.MRT_BLOCKED: - return 'MRT record blocked by a different transaction.' + return 'Transaction record blocked by a different transaction.' case exports.MRT_VERSION_MISMATCH: - return 'MRT read version mismatch identified during commit. Some other command changed the record outside of the transaction.' + return 'Transaction read version mismatch identified during commit. Some other command changed the record outside of the transaction.' case exports.MRT_EXPIRED: - return 'MRT deadline reached without a successful commit or abort.' + return 'Transaction deadline reached without a successful commit or abort.' case exports.MRT_TOO_MANY_WRITES: - return 'MRT write command limit (4096) exceeded.' + return 'Transaction write command limit (4096) exceeded.' case exports.MRT_COMMITTED: - return 'MRT was already committed.' + return 'Transaction was already committed.' case exports.MRT_ABORTED: - return 'MRT was already aborted.' + return 'Transaction was already aborted.' + + case exports.MRT_ALREADY_LOCKED: + return 'This record has been locked by a previous update in this transaction.' + + case exports.MRT_MONITOR_EXISTS: + return 'This transaction has already started. Writing to the same transaction with independent threads is unsafe.' case exports.ERR_BATCH_DISABLED: return 'Batch functionality has been disabled.' case exports.ERR_BATCH_MAX_REQUESTS_EXCEEDED: - return 'Batch max. requests have been exceeded.' + return 'Batch max requests have been exceeded.' case exports.ERR_BATCH_QUEUES_FULL: return 'All batch queues are full.' case exports.ERR_GEO_INVALID_GEOJSON: - return 'Invalid/unsupported GeoJSON.' + return 'Invalid/Unsupported GeoJSON.' case exports.ERR_INDEX_FOUND: return 'Index found.' @@ -788,13 +849,13 @@ exports.getMessage = function (code) { return 'Unable to read the index.' case exports.ERR_INDEX: - return 'Generic SI error.' + return 'Generic secondary index error.' case exports.ERR_INDEX_NAME_MAXLEN: return 'Index name is too long.' case exports.ERR_INDEX_MAXCOUNT: - return 'System alrady has maximum allowed indeces.' + return 'System already has maximum allowed indices.' case exports.ERR_QUERY_ABORTED: return 'Query was aborted.' @@ -803,7 +864,7 @@ exports.getMessage = function (code) { return 'Query processing queue is full.' case exports.ERR_QUERY_TIMEOUT: - return 'SI query timed out on server.' + return 'Secondary index query timed out on server.' case exports.ERR_QUERY: return 'Generic query error.' diff --git a/package-lock.json b/package-lock.json index b96ea9745..574d9a500 100644 --- a/package-lock.json +++ b/package-lock.json @@ -697,6 +697,7 @@ "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "detect-libc": "^2.0.0", "https-proxy-agent": "^5.0.0", diff --git a/package.json b/package.json index 5eb089650..aa5e1b213 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "preinstall": "npm install @mapbox/node-pre-gyp", "install": "npm run build", "build": "node-pre-gyp install --fallback-to-build", - "test-prereq": "cd ts-test; npm install ..; run: npm i --save-dev @types/jest; run: npm i --save-dev @types/chai; cd ..;", + "test-prereq": "cd ts-test; npm install ..; npm i --save-dev @types/jest; npm i --save-dev @types/chai; cd ..;", "test": "rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha dist/${npm_config_testfile:-} ", "test-dry-run": "mocha --dry-run", "test-noserver": "GLOBAL_CLIENT=false mocha -g '#noserver'", diff --git a/src/main/enums/abort_status.cc b/src/main/enums/abort_status.cc index a794a7a97..a6059bdfb 100644 --- a/src/main/enums/abort_status.cc +++ b/src/main/enums/abort_status.cc @@ -31,7 +31,6 @@ Local abortStatus() Nan::EscapableHandleScope scope; Local obj = Nan::New(); set(obj, "OK", AS_ABORT_OK); - set(obj, "ALREADY_COMMITTED", AS_ABORT_ALREADY_COMMITTED); set(obj, "ALREADY_ABORTED", AS_ABORT_ALREADY_ABORTED); set(obj, "ROLL_BACK_ABANDONED", AS_ABORT_ROLL_BACK_ABANDONED); set(obj, "CLOSE_ABANDONED", AS_ABORT_CLOSE_ABANDONED); diff --git a/src/main/enums/commit_status.cc b/src/main/enums/commit_status.cc index 381a24916..c631f8a0e 100644 --- a/src/main/enums/commit_status.cc +++ b/src/main/enums/commit_status.cc @@ -32,7 +32,6 @@ Local commitStatus() Local obj = Nan::New(); set(obj, "OK", AS_COMMIT_OK); set(obj, "ALREADY_COMMITTED", AS_COMMIT_ALREADY_COMMITTED); - set(obj, "ALREADY_ABORTED", AS_COMMIT_ALREADY_ABORTED); set(obj, "VERIFY_FAILED", AS_COMMIT_VERIFY_FAILED); set(obj, "MARK_ROLL_FORWARD_ABANDONED", AS_COMMIT_MARK_ROLL_FORWARD_ABANDONED); set(obj, "ROLL_FORWARD_ABANDONED", AS_COMMIT_ROLL_FORWARD_ABANDONED); diff --git a/src/main/enums/status.cc b/src/main/enums/status.cc index 9a0f283f8..f98eb1fc8 100644 --- a/src/main/enums/status.cc +++ b/src/main/enums/status.cc @@ -30,12 +30,14 @@ Local status() { Nan::EscapableHandleScope scope; Local obj = Nan::New(); + set(obj, "AEROSPIKE_TXN_ALREADY_ABORTED", AEROSPIKE_TXN_ALREADY_ABORTED); + set(obj, "AEROSPIKE_TXN_ALREADY_COMMITTED", AEROSPIKE_TXN_ALREADY_COMMITTED); set(obj, "AEROSPIKE_TXN_FAILED", AEROSPIKE_TXN_FAILED); set(obj, "AEROSPIKE_BATCH_FAILED", AEROSPIKE_BATCH_FAILED); set(obj, "AEROSPIKE_NO_RESPONSE", AEROSPIKE_NO_RESPONSE); set(obj, "AEROSPIKE_MAX_ERROR_RATE", AEROSPIKE_MAX_ERROR_RATE); set(obj, "AEROSPIKE_USE_NORMAL_RETRY", AEROSPIKE_USE_NORMAL_RETRY); - set(obj, "AEROSPIKE_ERR_MAX_RETRIES_EXCEEDED", AEROSPIKE_USE_NORMAL_RETRY); + set(obj, "AEROSPIKE_ERR_MAX_RETRIES_EXCEEDED", AEROSPIKE_ERR_MAX_RETRIES_EXCEEDED); set(obj, "AEROSPIKE_ERR_ASYNC_QUEUE_FULL", AEROSPIKE_ERR_ASYNC_QUEUE_FULL); set(obj, "AEROSPIKE_ERR_CONNECTION", AEROSPIKE_ERR_CONNECTION); set(obj, "AEROSPIKE_ERR_TLS_ERROR", AEROSPIKE_ERR_TLS_ERROR); @@ -89,8 +91,11 @@ Local status() set(obj, "AEROSPIKE_MRT_VERSION_MISMATCH", AEROSPIKE_MRT_VERSION_MISMATCH); set(obj, "AEROSPIKE_MRT_EXPIRED", AEROSPIKE_MRT_EXPIRED); set(obj, "AEROSPIKE_XDR_KEY_BUSY", AEROSPIKE_XDR_KEY_BUSY); + set(obj, "AEROSPIKE_MRT_TOO_MANY_WRITES", AEROSPIKE_MRT_TOO_MANY_WRITES); set(obj, "AEROSPIKE_MRT_COMMITTED", AEROSPIKE_MRT_COMMITTED); set(obj, "AEROSPIKE_MRT_ABORTED", AEROSPIKE_MRT_ABORTED); + set(obj, "AEROSPIKE_MRT_ALREADY_LOCKED", AEROSPIKE_MRT_ALREADY_LOCKED); + set(obj, "AEROSPIKE_MRT_MONITOR_EXISTS", AEROSPIKE_MRT_MONITOR_EXISTS); set(obj, "AEROSPIKE_QUERY_END", AEROSPIKE_QUERY_END); set(obj, "AEROSPIKE_SECURITY_NOT_SUPPORTED", AEROSPIKE_SECURITY_NOT_SUPPORTED); @@ -115,6 +120,8 @@ Local status() set(obj, "AEROSPIKE_INVALID_QUOTA", AEROSPIKE_INVALID_QUOTA); set(obj, "AEROSPIKE_NOT_AUTHENTICATED", AEROSPIKE_NOT_AUTHENTICATED); set(obj, "AEROSPIKE_ROLE_VIOLATION", AEROSPIKE_ROLE_VIOLATION); + set(obj, "AEROSPIKE_NOT_WHITELISTED", AEROSPIKE_NOT_WHITELISTED); + set(obj, "AEROSPIKE_QUOTA_EXCEEDED", AEROSPIKE_QUOTA_EXCEEDED); set(obj, "AEROSPIKE_ERR_UDF", AEROSPIKE_ERR_UDF); set(obj, "AEROSPIKE_ERR_BATCH_DISABLED", AEROSPIKE_ERR_BATCH_DISABLED); set(obj, "AEROSPIKE_ERR_BATCH_MAX_REQUESTS_EXCEEDED", diff --git a/ts-test/package-lock.json b/ts-test/package-lock.json index 115a84a9e..1c6dfa134 100644 --- a/ts-test/package-lock.json +++ b/ts-test/package-lock.json @@ -13,6 +13,7 @@ }, "devDependencies": { "@types/chai": "^5.0.1", + "@types/jest": "^29.5.14", "@types/mocha": "^10.0.7", "@types/semver": "^7.5.8", "@types/tmp": "^0.2.6", @@ -25,7 +26,7 @@ }, "..": { "name": "aerospike", - "version": "5.13.1", + "version": "6.0.1", "cpu": [ "x64", "arm64" @@ -73,6 +74,31 @@ "node": ">=4" } }, + "node_modules/@babel/code-frame": { + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.25.9", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", + "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -86,6 +112,50 @@ "node": ">=12" } }, + "node_modules/@jest/expect-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", + "dev": true, + "license": "MIT", + "dependencies": { + "jest-get-type": "^29.6.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", @@ -165,6 +235,13 @@ "integrity": "sha512-TMp15K+GGYrWlZM8+Lnj9EaHEFmOen0WJBrfa17hF7taDOYthuPPV0GWzfd/9iMij0akS/8Yw2ikquH7uVi/fg==", "dev": true }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true, + "license": "MIT" + }, "node_modules/@tsconfig/node10": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", @@ -198,6 +275,7 @@ "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.0.1.tgz", "integrity": "sha512-5T8ajsg3M/FOncpLYW7sdOcD6yf4+722sze/tc4KQV0P8Z2rAr3SAuHCIkYmYpt8VbcQlnz8SxlOlPQYefe4cA==", "dev": true, + "license": "MIT", "dependencies": { "@types/deep-eql": "*" } @@ -217,6 +295,44 @@ "@types/unist": "*" } }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "29.5.14", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz", + "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "expect": "^29.0.0", + "pretty-format": "^29.0.0" + } + }, "node_modules/@types/mdast": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz", @@ -238,7 +354,6 @@ "integrity": "sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": "~6.13.0" } @@ -249,6 +364,13 @@ "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/tmp": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz", @@ -524,6 +646,22 @@ "fsevents": "~2.3.2" } }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -643,6 +781,16 @@ "node": ">=0.3.1" } }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -685,6 +833,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/expect": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", @@ -791,6 +956,13 @@ "node": ">= 6" } }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -955,6 +1127,94 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-message-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^29.6.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^29.7.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-util": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/types": "^29.6.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT" + }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -1156,6 +1416,20 @@ } ] }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/minimatch": { "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", @@ -1286,6 +1560,13 @@ "node": ">=8" } }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", @@ -1299,6 +1580,34 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/property-information": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz", @@ -1328,6 +1637,13 @@ "safe-buffer": "^5.1.0" } }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "dev": true, + "license": "MIT" + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -1402,6 +1718,16 @@ "@types/hast": "^3.0.4" } }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/space-separated-tokens": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", @@ -1412,6 +1738,29 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/stack-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -1622,8 +1971,7 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz", "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/unist-util-is": { "version": "6.0.0", diff --git a/ts-test/package.json b/ts-test/package.json index 11d91d512..360125592 100644 --- a/ts-test/package.json +++ b/ts-test/package.json @@ -14,6 +14,7 @@ "description": "", "devDependencies": { "@types/chai": "^5.0.1", + "@types/jest": "^29.5.14", "@types/mocha": "^10.0.7", "@types/semver": "^7.5.8", "@types/tmp": "^0.2.6", diff --git a/ts-test/tests/error.ts b/ts-test/tests/error.ts index 2942cd0d1..bc4d577f1 100644 --- a/ts-test/tests/error.ts +++ b/ts-test/tests/error.ts @@ -103,7 +103,7 @@ describe('AerospikeError #noserver', function () { message: '127.0.0.1:3000 AEROSPIKE_ERR_RECORD_NOT_FOUND' } const subject = (ASError as any).fromASError(error) - expect(subject.message).to.equal('127.0.0.1:3000 Record does not exist in database. May be returned by read, or write with policy Aerospike.policy.exists.UPDATE') + expect(subject.message).to.equal('127.0.0.1:3000 Record does not exist in database. May be returned by read, or write with policy Aerospike.policy.exists.UPDATE.') }) it('returns an AerospikeError instance unmodified', function () { diff --git a/ts-test/tests/mrt_api.ts b/ts-test/tests/mrt_api.ts index ae2727dbd..045bc4d42 100644 --- a/ts-test/tests/mrt_api.ts +++ b/ts-test/tests/mrt_api.ts @@ -99,6 +99,44 @@ describe('MRT API Tests', function () { }) }) + context('transaction.abortStatus', function () { + it('OK', async function () { + expect(Aerospike.Transaction.abortStatus.OK).to.equal(0) + }) + it('ALREADY_ABORTED', async function () { + expect(Aerospike.Transaction.abortStatus.ALREADY_ABORTED).to.equal(0) + }) + it('ROLL_BACK_ABANDONED', async function () { + expect(Aerospike.Transaction.abortStatus.ROLL_BACK_ABANDONED).to.equal(0) + }) + it('CLOSE_ABANDONED', async function () { + expect(Aerospike.Transaction.abortStatus.CLOSE_ABANDONED).to.equal(0) + }) + + }) + + context('transaction.commitStatus', function () { + it('OK', async function () { + expect(Aerospike.Transaction.commitStatus.OK).to.equal(0) + }) + it('ALREADY_COMMITTED', async function () { + expect(Aerospike.Transaction.commitStatus.ALREADY_COMMITTED).to.equal(0) + }) + it('VERIFY_FAILED', async function () { + expect(Aerospike.Transaction.commitStatus.VERIFY_FAILED).to.equal(0) + }) + it('MARK_ROLL_FORWARD_ABANDONED', async function () { + expect(Aerospike.Transaction.commitStatus.MARK_ROLL_FORWARD_ABANDONED).to.equal(0) + }) + it('ROLL_FORWARD_ABANDONED', async function () { + expect(Aerospike.Transaction.commitStatus.ROLL_FORWARD_ABANDONED).to.equal(0) + }) + it('CLOSE_ABANDONED', async function () { + expect(Aerospike.Transaction.commitStatus.CLOSE_ABANDONED).to.equal(0) + }) + + }) + it('should fail with readsCapacity error string', function () { expect(() => new Aerospike.Transaction("256" as any, 256)).to.throw('Must specify a number for readsCapacity'); diff --git a/ts-test/tests/mrt_backward_compatible.ts b/ts-test/tests/mrt_backward_compatible.ts index 9c5d5db86..d3ef75474 100644 --- a/ts-test/tests/mrt_backward_compatible.ts +++ b/ts-test/tests/mrt_backward_compatible.ts @@ -31,7 +31,7 @@ const recgen: any = helper.recgen const status: typeof statusModule = Aerospike.status describe('MRT backward compatible tests', function () { - helper.skip(this, 'MRT\'s require version 8.0.0 or greater') + helper.skipUnlessVersion('< 8.0.0', this) // helper.skipUnlessVersionAndCommunity('< 8.0.0', this) @@ -71,6 +71,9 @@ describe('MRT backward compatible tests', function () { }; await client.put(key1, record2, meta, policy) + await client.put(key2, record2, meta, policy) + await client.put(key3, record2, meta, policy) + await client.put(key4, record2, meta, policy) let get_result: AerospikeRecord = await client.get(key1, policy) expect(get_result.bins).to.eql(record2) diff --git a/ts-test/tests/mrt_functionality.ts b/ts-test/tests/mrt_functionality.ts index 59b0a65e1..93da1cce5 100644 --- a/ts-test/tests/mrt_functionality.ts +++ b/ts-test/tests/mrt_functionality.ts @@ -153,7 +153,14 @@ describe('MRT functionality tests', function () { result = await client.commit(mrt) - expect(result).to.eql(Aerospike.Transaction.commitStatus.ALREADY_ABORTED) + try{ + await client.commit(mrt) + } + catch (error: any) { + expect(error.code).to.eql(Aerospike.status.TXN_ALREADY_ABORTED) + } + + assert.fail('An ALREADY_ABORTED error should have been thrown') }) it('should fail to abort after committing', async function () { @@ -168,7 +175,14 @@ describe('MRT functionality tests', function () { let result: number = await client.commit(mrt) result = await client.abort(mrt) - expect(result).to.eql(Aerospike.Transaction.abortStatus.ALREADY_COMMITTED) + try{ + await client.abort(mrt) + } + catch (error: any) { + expect(error.code).to.eql(Aerospike.status.TXN_ALREADY_COMMITTED) + } + + assert.fail('An ALREADY_COMMITTED error should have been thrown') }) diff --git a/ts-test/tests/status.ts b/ts-test/tests/status.ts new file mode 100644 index 000000000..78922a2a9 --- /dev/null +++ b/ts-test/tests/status.ts @@ -0,0 +1,623 @@ +// ***************************************************************************** +// Copyright 2013-2024 Aerospike, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License") +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// ***************************************************************************** + +'use strict' + +/* global expect, describe, it */ + +import Aerospike, { status as stat } from 'aerospike' + +import { expect } from 'chai' + +const status: typeof stat = Aerospike.status + +describe('Aerospike.status #noserver', function () { + it('AEROSPIKE_TXN_ALREADY_ABORTED', function () { + expect(status.AEROSPIKE_TXN_ALREADY_ABORTED).to.equal(-19) + expect(status.TXN_ALREADY_ABORTED).to.equal(-19) + expect(status.getMessage(status.TXN_ALREADY_ABORTED)).to.equal('Transaction commit called, but the transaction was already aborted.') + }) + + it('AEROSPIKE_TXN_ALREADY_COMMITTED', function () { + expect(status.AEROSPIKE_TXN_ALREADY_COMMITTED).to.equal(-18) + expect(status.TXN_ALREADY_COMMITTED).to.equal(-18) + expect(status.getMessage(status.TXN_ALREADY_COMMITTED)).to.equal('Transaction abort called, but the transaction was already committed.') + }) + + it('AEROSPIKE_TXN_FAILED', function () { + expect(status.AEROSPIKE_TXN_FAILED).to.equal(-17) + expect(status.TXN_FAILED).to.equal(-17) + expect(status.getMessage(status.TXN_FAILED)).to.equal('Transaction failed.') + }) + + it('AEROSPIKE_BATCH_FAILED', function () { + expect(status.AEROSPIKE_BATCH_FAILED).to.equal(-16) + expect(status.BATCH_FAILED).to.equal(-16) + expect(status.getMessage(status.BATCH_FAILED)).to.equal('One or more keys failed in a batch.') + }) + + it('AEROSPIKE_NO_RESPONSE', function () { + expect(status.AEROSPIKE_NO_RESPONSE).to.equal(-15) + expect(status.NO_RESPONSE).to.equal(-15) + expect(status.getMessage(status.NO_RESPONSE)).to.equal('No response received from server.') + }) + + it('AEROSPIKE_MAX_ERROR_RATE', function () { + expect(status.AEROSPIKE_MAX_ERROR_RATE).to.equal(-14) + expect(status.MAX_ERROR_RATE).to.equal(-14) + expect(status.getMessage(status.MAX_ERROR_RATE)).to.equal('Max errors limit reached.') + }) + + it('AEROSPIKE_USE_NORMAL_RETRY', function () { + expect(status.AEROSPIKE_USE_NORMAL_RETRY).to.equal(-13) + expect(status.USE_NORMAL_RETRY).to.equal(-13) + expect(status.getMessage(status.USE_NORMAL_RETRY)).to.equal('Abort split batch retry and use normal node retry instead. Used internally and should not be returned to user.') + }) + + it('AEROSPIKE_ERR_MAX_RETRIES_EXCEEDED', function () { + expect(status.AEROSPIKE_ERR_MAX_RETRIES_EXCEEDED).to.equal(-12) + expect(status.ERR_MAX_RETRIES_EXCEEDED).to.equal(-12) + expect(status.getMessage(status.ERR_MAX_RETRIES_EXCEEDED)).to.equal('Max retries limit reached.') + }) + + it('AEROSPIKE_ERR_ASYNC_QUEUE_FULL', function () { + expect(status.AEROSPIKE_ERR_ASYNC_QUEUE_FULL).to.equal(-11) + expect(status.ERR_ASYNC_QUEUE_FULL).to.equal(-11) + expect(status.getMessage(status.ERR_ASYNC_QUEUE_FULL)).to.equal('Async command delay queue is full.') + }) + + it('AEROSPIKE_ERR_CONNECTION', function () { + expect(status.AEROSPIKE_ERR_CONNECTION).to.equal(-10) + expect(status.ERR_CONNECTION).to.equal(-10) + expect(status.getMessage(status.ERR_CONNECTION)).to.equal('Synchronous connection error.') + }) + + it('AEROSPIKE_ERR_TLS_ERROR', function () { + expect(status.AEROSPIKE_ERR_TLS_ERROR).to.equal(-9) + expect(status.ERR_TLS_ERROR).to.equal(-9) + expect(status.getMessage(status.ERR_TLS_ERROR)).to.equal('TLS related error') + }) + + it('AEROSPIKE_ERR_INVALID_NODE', function () { + expect(status.AEROSPIKE_ERR_INVALID_NODE).to.equal(-8) + expect(status.ERR_INVALID_NODE).to.equal(-8) + expect(status.getMessage(status.ERR_INVALID_NODE)).to.equal('Node invalid or could not be found.') + }) + + it('AEROSPIKE_ERR_NO_MORE_CONNECTIONS', function () { + expect(status.AEROSPIKE_ERR_NO_MORE_CONNECTIONS).to.equal(-7) + expect(status.ERR_NO_MORE_CONNECTIONS).to.equal(-7) + expect(status.getMessage(status.ERR_NO_MORE_CONNECTIONS)).to.equal('Max connections would be exceeded.') + }) + + it('AEROSPIKE_ERR_ASYNC_CONNECTION', function () { + expect(status.AEROSPIKE_ERR_ASYNC_CONNECTION).to.equal(-6) + expect(status.ERR_ASYNC_CONNECTION).to.equal(-6) + expect(status.getMessage(status.ERR_ASYNC_CONNECTION)).to.equal('Asynchronous connection error.') + }) + + it('AEROSPIKE_ERR_CLIENT_ABORT', function () { + expect(status.AEROSPIKE_ERR_CLIENT_ABORT).to.equal(-5) + expect(status.ERR_CLIENT_ABORT).to.equal(-5) + expect(status.getMessage(status.ERR_CLIENT_ABORT)).to.equal('Query or scan was aborted in user\'s callback.') + }) + + it('AEROSPIKE_ERR_INVALID_HOST', function () { + expect(status.AEROSPIKE_ERR_INVALID_HOST).to.equal(-4) + expect(status.ERR_INVALID_HOST).to.equal(-4) + expect(status.getMessage(status.ERR_INVALID_HOST)).to.equal('Host name could not be found in DNS lookup.') + }) + + it('AEROSPIKE_NO_MORE_RECORDS', function () { + expect(status.AEROSPIKE_NO_MORE_RECORDS).to.equal(-3) + expect(status.NO_MORE_RECORDS).to.equal(-3) + expect(status.getMessage(status.NO_MORE_RECORDS)).to.equal('No more records available when parsing batch, scan or query records.') + }) + + it('AEROSPIKE_ERR_PARAM', function () { + expect(status.AEROSPIKE_ERR_PARAM).to.equal(-2) + expect(status.ERR_PARAM).to.equal(-2) + expect(status.getMessage(status.ERR_PARAM)).to.equal('Invalid client API parameter.') + }) + + it('AEROSPIKE_ERR_CLIENT', function () { + expect(status.AEROSPIKE_ERR_CLIENT).to.equal(-1) + expect(status.ERR_CLIENT).to.equal(-1) + expect(status.getMessage(status.AEROSPIKE_ERR_CLIENT)).to.equal('Generic client API usage error.') + }) + + it('AEROSPIKE_OK', function () { + expect(status.AEROSPIKE_OK).to.equal(0) + expect(status.OK).to.equal(0) + expect(status.getMessage(status.OK)).to.equal('Generic success.') + }) + + it('AEROSPIKE_ERR_SERVER', function () { + expect(status.AEROSPIKE_ERR_SERVER).to.equal(1) + expect(status.ERR_SERVER).to.equal(1) + expect(status.getMessage(status.ERR_SERVER)).to.equal('Generic error returned by server.') + }) + + it('AEROSPIKE_ERR_RECORD_NOT_FOUND', function () { + expect(status.AEROSPIKE_ERR_RECORD_NOT_FOUND).to.equal(2) + expect(status.ERR_RECORD_NOT_FOUND).to.equal(2) + expect(status.getMessage(status.ERR_RECORD_NOT_FOUND)).to.equal('Record does not exist in database. May be returned by read, or write with policy Aerospike.policy.exists.UPDATE.') + }) + + it('AEROSPIKE_ERR_RECORD_GENERATION', function () { + expect(status.AEROSPIKE_ERR_RECORD_GENERATION).to.equal(3) + expect(status.ERR_RECORD_GENERATION).to.equal(3) + expect(status.getMessage(status.ERR_RECORD_GENERATION)).to.equal('Generation of record in database does not satisfy write policy.') + }) + + it('AEROSPIKE_ERR_REQUEST_INVALID', function () { + expect(status.AEROSPIKE_ERR_REQUEST_INVALID).to.equal(4) + expect(status.ERR_REQUEST_INVALID).to.equal(4) + expect(status.getMessage(status.ERR_REQUEST_INVALID)).to.equal('Request protocol invalid, or invalid protocol field.') + }) + + it('AEROSPIKE_ERR_RECORD_EXISTS', function () { + expect(status.AEROSPIKE_ERR_RECORD_EXISTS).to.equal(5) + expect(status.ERR_RECORD_EXISTS).to.equal(5) + expect(status.getMessage(status.ERR_RECORD_EXISTS)).to.equal('Record already exists. May be returned by write with policy Aerospike.policy.exists.CREATE.') + }) + + it('AEROSPIKE_ERR_BIN_EXISTS', function () { + expect(status.AEROSPIKE_ERR_BIN_EXISTS).to.equal(6) + expect(status.ERR_BIN_EXISTS).to.equal(6) + expect(status.getMessage(status.ERR_BIN_EXISTS)).to.equal('Bin already exists on a create-only operation.') + }) + + it('AEROSPIKE_ERR_CLUSTER_CHANGE', function () { + expect(status.AEROSPIKE_ERR_CLUSTER_CHANGE).to.equal(7) + expect(status.ERR_CLUSTER_CHANGE).to.equal(7) + expect(status.getMessage(status.ERR_CLUSTER_CHANGE)).to.equal('A cluster state change occurred during the request. This may also be returned by scan operations with the fail_on_cluster_change flag set.') + }) + + it('AEROSPIKE_ERR_SERVER_FULL', function () { + expect(status.AEROSPIKE_ERR_SERVER_FULL).to.equal(8) + expect(status.ERR_SERVER_FULL).to.equal(8) + expect(status.getMessage(status.ERR_SERVER_FULL)).to.equal('The server node is running out of memory and/or storage device space reserved for the specified namespace.') + }) + + it('AEROSPIKE_ERR_TIMEOUT', function () { + expect(status.AEROSPIKE_ERR_TIMEOUT).to.equal(9) + expect(status.ERR_TIMEOUT).to.equal(9) + expect(status.getMessage(status.ERR_TIMEOUT)).to.equal('Request timed out. Can be triggered by client or server.') + }) + + it('AEROSPIKE_ERR_ALWAYS_FORBIDDEN', function () { + expect(status.AEROSPIKE_ERR_ALWAYS_FORBIDDEN).to.equal(10) + expect(status.ERR_ALWAYS_FORBIDDEN).to.equal(10) + expect(status.getMessage(status.ERR_ALWAYS_FORBIDDEN)).to.equal('Operation not allowed in current configuration.') + }) + + it('AEROSPIKE_ERR_CLUSTER', function () { + expect(status.AEROSPIKE_ERR_CLUSTER).to.equal(11) + expect(status.ERR_CLUSTER).to.equal(11) + expect(status.getMessage(status.ERR_CLUSTER)).to.equal('Partition is unavailable.') + }) + + it('AEROSPIKE_ERR_BIN_INCOMPATIBLE_TYPE', function () { + expect(status.AEROSPIKE_ERR_BIN_INCOMPATIBLE_TYPE).to.equal(12) + expect(status.ERR_BIN_INCOMPATIBLE_TYPE).to.equal(12) + expect(status.getMessage(status.ERR_BIN_INCOMPATIBLE_TYPE)).to.equal('Bin modification operation can\'t be done on an existing bin due to its value type.') + }) + + it('AEROSPIKE_ERR_RECORD_TOO_BIG', function () { + expect(status.AEROSPIKE_ERR_RECORD_TOO_BIG).to.equal(13) + expect(status.ERR_RECORD_TOO_BIG).to.equal(13) + expect(status.getMessage(status.ERR_RECORD_TOO_BIG)).to.equal('Record being (re-)written can\'t fit in a storage write block.') + }) + + it('AEROSPIKE_ERR_RECORD_BUSY', function () { + expect(status.AEROSPIKE_ERR_RECORD_BUSY).to.equal(14) + expect(status.ERR_RECORD_BUSY).to.equal(14) + expect(status.getMessage(status.ERR_RECORD_BUSY)).to.equal('Too many concurrent requests for one record - a "hot-key" situation.') + }) + + it('AEROSPIKE_ERR_SCAN_ABORTED', function () { + expect(status.AEROSPIKE_ERR_SCAN_ABORTED).to.equal(15) + expect(status.ERR_SCAN_ABORTED).to.equal(15) + expect(status.getMessage(status.ERR_SCAN_ABORTED)).to.equal('Scan aborted by user.') + }) + + it('AEROSPIKE_ERR_UNSUPPORTED_FEATURE', function () { + expect(status.AEROSPIKE_ERR_UNSUPPORTED_FEATURE).to.equal(16) + expect(status.ERR_UNSUPPORTED_FEATURE).to.equal(16) + expect(status.getMessage(status.ERR_UNSUPPORTED_FEATURE)).to.equal('Sometimes our doc, or our customers wishes, get ahead of us. We may have processed something that the server is not ready for (unsupported feature).') + }) + + it('AEROSPIKE_ERR_BIN_NOT_FOUND', function () { + expect(status.AEROSPIKE_ERR_BIN_NOT_FOUND).to.equal(17) + expect(status.ERR_BIN_NOT_FOUND).to.equal(17) + expect(status.getMessage(status.ERR_BIN_NOT_FOUND)).to.equal('Bin not found on update-only operation.') + }) + + it('AEROSPIKE_ERR_DEVICE_OVERLOAD', function () { + expect(status.AEROSPIKE_ERR_DEVICE_OVERLOAD).to.equal(18) + expect(status.ERR_DEVICE_OVERLOAD).to.equal(18) + expect(status.getMessage(status.ERR_DEVICE_OVERLOAD)).to.equal('The server node\'s storage device(s) can\'t keep up with the write load.') + }) + + it('AEROSPIKE_ERR_RECORD_KEY_MISMATCH', function () { + expect(status.AEROSPIKE_ERR_RECORD_KEY_MISMATCH).to.equal(19) + expect(status.ERR_RECORD_KEY_MISMATCH).to.equal(19) + expect(status.getMessage(status.ERR_RECORD_KEY_MISMATCH)).to.equal('Record key sent with command did not match key stored on server.') + }) + + it('AEROSPIKE_ERR_NAMESPACE_NOT_FOUND', function () { + expect(status.AEROSPIKE_ERR_NAMESPACE_NOT_FOUND).to.equal(20) + expect(status.ERR_NAMESPACE_NOT_FOUND).to.equal(20) + expect(status.getMessage(status.ERR_NAMESPACE_NOT_FOUND)).to.equal('Namespace in request not found on server.') + }) + + it('AEROSPIKE_ERR_BIN_NAME', function () { + expect(status.AEROSPIKE_ERR_BIN_NAME).to.equal(21) + expect(status.ERR_BIN_NAME).to.equal(21) + expect(status.getMessage(status.ERR_BIN_NAME)).to.equal('Sent too-long bin name (should be impossible in this client) or exceeded namespace\'s bin name quota.') + }) + + it('AEROSPIKE_ERR_FAIL_FORBIDDEN', function () { + expect(status.AEROSPIKE_ERR_FAIL_FORBIDDEN).to.equal(22) + expect(status.ERR_FAIL_FORBIDDEN).to.equal(22) + expect(status.getMessage(status.ERR_FAIL_FORBIDDEN)).to.equal('Operation not allowed at this time.') + }) + + it('AEROSPIKE_ERR_FAIL_ELEMENT_NOT_FOUND', function () { + expect(status.AEROSPIKE_ERR_FAIL_ELEMENT_NOT_FOUND).to.equal(23) + expect(status.ERR_FAIL_ELEMENT_NOT_FOUND).to.equal(23) + expect(status.getMessage(status.ERR_FAIL_ELEMENT_NOT_FOUND)).to.equal('Map element not found in UPDATE_ONLY write mode.') + }) + + it('AEROSPIKE_ERR_FAIL_ELEMENT_EXISTS', function () { + expect(status.AEROSPIKE_ERR_FAIL_ELEMENT_EXISTS).to.equal(24) + expect(status.ERR_FAIL_ELEMENT_EXISTS).to.equal(24) + expect(status.getMessage(status.ERR_FAIL_ELEMENT_EXISTS)).to.equal('Map element exists in CREATE_ONLY write mode.') + }) + + it('AEROSPIKE_ERR_ENTERPRISE_ONLY', function () { + expect(status.AEROSPIKE_ERR_ENTERPRISE_ONLY).to.equal(25) + expect(status.ERR_ENTERPRISE_ONLY).to.equal(25) + expect(status.getMessage(status.ERR_ENTERPRISE_ONLY)).to.equal('Attempt to use an Enterprise feature on a Community server or a server without the applicable feature key.') + }) + + it('AEROSPIKE_ERR_OP_NOT_APPLICABLE', function () { + expect(status.AEROSPIKE_ERR_OP_NOT_APPLICABLE).to.equal(26) + expect(status.ERR_OP_NOT_APPLICABLE).to.equal(26) + expect(status.getMessage(status.ERR_OP_NOT_APPLICABLE)).to.equal('The operation cannot be applied to the current bin value on the server.') + }) + + it('AEROSPIKE_FILTERED_OUT', function () { + expect(status.AEROSPIKE_FILTERED_OUT).to.equal(27) + expect(status.FILTERED_OUT).to.equal(27) + expect(status.getMessage(status.FILTERED_OUT)).to.equal('The command was not performed because the filter expression was false.') + }) + + it('AEROSPIKE_LOST_CONFLICT', function () { + expect(status.AEROSPIKE_LOST_CONFLICT).to.equal(28) + expect(status.LOST_CONFLICT).to.equal(28) + expect(status.getMessage(status.LOST_CONFLICT)).to.equal('Write command loses conflict to XDR.') + }) + + it('AEROSPIKE_XDR_KEY_BUSY', function () { + expect(status.AEROSPIKE_XDR_KEY_BUSY).to.equal(32) + expect(status.XDR_KEY_BUSY).to.equal(32) + expect(status.getMessage(status.XDR_KEY_BUSY)).to.equal('Write can\'t complete until XDR finishes shipping.') + }) + + it('AEROSPIKE_QUERY_END', function () { + expect(status.AEROSPIKE_QUERY_END).to.equal(50) + expect(status.QUERY_END).to.equal(50) + expect(status.getMessage(status.QUERY_END)).to.equal('There are no more records left for query.') + }) + + it('AEROSPIKE_SECURITY_NOT_SUPPORTED', function () { + expect(status.AEROSPIKE_SECURITY_NOT_SUPPORTED).to.equal(51) + expect(status.SECURITY_NOT_SUPPORTED).to.equal(51) + expect(status.getMessage(status.SECURITY_NOT_SUPPORTED)).to.equal('Security functionality not supported by connected server.') + }) + + it('AEROSPIKE_SECURITY_NOT_ENABLED', function () { + expect(status.AEROSPIKE_SECURITY_NOT_ENABLED).to.equal(52) + expect(status.SECURITY_NOT_ENABLED).to.equal(52) + expect(status.getMessage(status.SECURITY_NOT_ENABLED)).to.equal('Security functionality not enabled by connected server.') + }) + + it('AEROSPIKE_SECURITY_SCHEME_NOT_SUPPORTED', function () { + expect(status.AEROSPIKE_SECURITY_SCHEME_NOT_SUPPORTED).to.equal(53) + expect(status.SECURITY_SCHEME_NOT_SUPPORTED).to.equal(53) + expect(status.getMessage(status.SECURITY_SCHEME_NOT_SUPPORTED)).to.equal('Security scheme not supported.') + }) + + it('AEROSPIKE_INVALID_COMMAND', function () { + expect(status.AEROSPIKE_INVALID_COMMAND).to.equal(54) + expect(status.INVALID_COMMAND).to.equal(54) + expect(status.getMessage(status.INVALID_COMMAND)).to.equal('Administration command is invalid.') + }) + + it('AEROSPIKE_INVALID_FIELD', function () { + expect(status.AEROSPIKE_INVALID_FIELD).to.equal(55) + expect(status.INVALID_FIELD).to.equal(55) + expect(status.getMessage(status.INVALID_FIELD)).to.equal('Administration field is invalid.') + }) + + it('AEROSPIKE_ILLEGAL_STATE', function () { + expect(status.AEROSPIKE_ILLEGAL_STATE).to.equal(56) + expect(status.ILLEGAL_STATE).to.equal(56) + expect(status.getMessage(status.ILLEGAL_STATE)).to.equal('Security protocol not followed.') + }) + + it('AEROSPIKE_INVALID_USER', function () { + expect(status.AEROSPIKE_INVALID_USER).to.equal(60) + expect(status.INVALID_USER).to.equal(60) + expect(status.getMessage(status.INVALID_USER)).to.equal('User name is invalid.') + }) + + it('AEROSPIKE_USER_ALREADY_EXISTS', function () { + expect(status.AEROSPIKE_USER_ALREADY_EXISTS).to.equal(61) + expect(status.USER_ALREADY_EXISTS).to.equal(61) + expect(status.getMessage(status.USER_ALREADY_EXISTS)).to.equal('User was previously created.') + }) + + it('AEROSPIKE_INVALID_PASSWORD', function () { + expect(status.AEROSPIKE_INVALID_PASSWORD).to.equal(62) + expect(status.INVALID_PASSWORD).to.equal(62) + expect(status.getMessage(status.INVALID_PASSWORD)).to.equal('Password is invalid.') + }) + + it('AEROSPIKE_EXPIRED_PASSWORD', function () { + expect(status.AEROSPIKE_EXPIRED_PASSWORD).to.equal(63) + expect(status.EXPIRED_PASSWORD).to.equal(63) + expect(status.getMessage(status.EXPIRED_PASSWORD)).to.equal('Password has expired.') + }) + + it('AEROSPIKE_FORBIDDEN_PASSWORD', function () { + expect(status.AEROSPIKE_FORBIDDEN_PASSWORD).to.equal(64) + expect(status.FORBIDDEN_PASSWORD).to.equal(64) + expect(status.getMessage(status.FORBIDDEN_PASSWORD)).to.equal('Forbidden password (e.g. recently used).') + }) + + it('AEROSPIKE_INVALID_CREDENTIAL', function () { + expect(status.AEROSPIKE_INVALID_CREDENTIAL).to.equal(65) + expect(status.INVALID_CREDENTIAL).to.equal(65) + expect(status.getMessage(status.INVALID_CREDENTIAL)).to.equal('Security credential is invalid.') + }) + + it('AEROSPIKE_EXPIRED_SESSION', function () { + expect(status.AEROSPIKE_EXPIRED_SESSION).to.equal(66) + expect(status.EXPIRED_SESSION).to.equal(66) + expect(status.getMessage(status.EXPIRED_SESSION)).to.equal('Login session expired.') + }) + + it('AEROSPIKE_INVALID_ROLE', function () { + expect(status.AEROSPIKE_INVALID_ROLE).to.equal(70) + expect(status.INVALID_ROLE).to.equal(70) + expect(status.getMessage(status.INVALID_ROLE)).to.equal('Role name is invalid.') + }) + + it('AEROSPIKE_ROLE_ALREADY_EXISTS', function () { + expect(status.AEROSPIKE_ROLE_ALREADY_EXISTS).to.equal(71) + expect(status.ROLE_ALREADY_EXISTS).to.equal(71) + expect(status.getMessage(status.ROLE_ALREADY_EXISTS)).to.equal('Role already exists.') + }) + + it('AEROSPIKE_INVALID_PRIVILEGE', function () { + expect(status.AEROSPIKE_INVALID_PRIVILEGE).to.equal(72) + expect(status.INVALID_PRIVILEGE).to.equal(72) + expect(status.getMessage(status.INVALID_PRIVILEGE)).to.equal('Privilege is invalid.') + }) + + it('AEROSPIKE_INVALID_WHITELIST', function () { + expect(status.AEROSPIKE_INVALID_WHITELIST).to.equal(73) + expect(status.INVALID_WHITELIST).to.equal(73) + expect(status.getMessage(status.INVALID_WHITELIST)).to.equal('Invalid IP whitelist.') + }) + + it('AEROSPIKE_QUOTAS_NOT_ENABLED', function () { + expect(status.AEROSPIKE_QUOTAS_NOT_ENABLED).to.equal(74) + expect(status.QUOTAS_NOT_ENABLED).to.equal(74) + expect(status.getMessage(status.QUOTAS_NOT_ENABLED)).to.equal('Quotas not enabled on server.') + }) + + it('AEROSPIKE_INVALID_QUOTA', function () { + expect(status.AEROSPIKE_INVALID_QUOTA).to.equal(75) + expect(status.INVALID_QUOTA).to.equal(75) + expect(status.getMessage(status.INVALID_QUOTA)).to.equal('Invalid quota.') + }) + + it('AEROSPIKE_NOT_AUTHENTICATED', function () { + expect(status.AEROSPIKE_NOT_AUTHENTICATED).to.equal(80) + expect(status.NOT_AUTHENTICATED).to.equal(80) + expect(status.getMessage(status.NOT_AUTHENTICATED)).to.equal('User must be authenticated before performing database operations.') + }) + + it('AEROSPIKE_ROLE_VIOLATION', function () { + expect(status.AEROSPIKE_ROLE_VIOLATION).to.equal(81) + expect(status.ROLE_VIOLATION).to.equal(81) + expect(status.getMessage(status.ROLE_VIOLATION)).to.equal('User does not possess the required role to perform the database operation.') + }) + + it('AEROSPIKE_NOT_WHITELISTED', function () { + expect(status.AEROSPIKE_NOT_WHITELISTED).to.equal(82) + expect(status.NOT_WHITELISTED).to.equal(82) + expect(status.getMessage(status.NOT_WHITELISTED)).to.equal('Command not allowed because sender IP not whitelisted.') + + }) + + it('AEROSPIKE_QUOTA_EXCEEDED', function () { + expect(status.AEROSPIKE_QUOTA_EXCEEDED).to.equal(83) + expect(status.QUOTA_EXCEEDED).to.equal(83) + expect(status.getMessage(status.QUOTA_EXCEEDED)).to.equal('Quota exceeded.') + }) + + it('AEROSPIKE_ERR_UDF', function () { + expect(status.AEROSPIKE_ERR_UDF).to.equal(100) + expect(status.ERR_UDF).to.equal(100) + expect(status.getMessage(status.ERR_UDF)).to.equal('Generic UDF error.') + }) + + it('AEROSPIKE_MRT_BLOCKED', function () { + expect(status.AEROSPIKE_MRT_BLOCKED).to.equal(120) + expect(status.MRT_BLOCKED).to.equal(120) + expect(status.getMessage(status.MRT_BLOCKED)).to.equal('Transaction record blocked by a different transaction.') + }) + + it('AEROSPIKE_MRT_VERSION_MISMATCH', function () { + expect(status.AEROSPIKE_MRT_VERSION_MISMATCH).to.equal(121) + expect(status.MRT_VERSION_MISMATCH).to.equal(121) + expect(status.getMessage(status.MRT_VERSION_MISMATCH)).to.equal('Transaction read version mismatch identified during commit. Some other command changed the record outside of the transaction.') + }) + + it('AEROSPIKE_MRT_EXPIRED', function () { + expect(status.AEROSPIKE_MRT_EXPIRED).to.equal(122) + expect(status.MRT_EXPIRED).to.equal(122) + expect(status.getMessage(status.MRT_EXPIRED)).to.equal('Transaction deadline reached without a successful commit or abort.') + }) + + it('AEROSPIKE_MRT_TOO_MANY_WRITES', function () { + expect(status.AEROSPIKE_MRT_TOO_MANY_WRITES).to.equal(123) + expect(status.MRT_TOO_MANY_WRITES).to.equal(123) + expect(status.getMessage(status.MRT_TOO_MANY_WRITES)).to.equal('Transaction write command limit (4096) exceeded.') + }) + + it('AEROSPIKE_MRT_COMMITTED', function () { + expect(status.AEROSPIKE_MRT_COMMITTED).to.equal(124) + expect(status.MRT_COMMITTED).to.equal(124) + expect(status.getMessage(status.MRT_COMMITTED)).to.equal('Transaction was already committed.') + }) + + it('AEROSPIKE_MRT_ABORTED', function () { + expect(status.AEROSPIKE_MRT_ABORTED).to.equal(125) + expect(status.MRT_ABORTED).to.equal(125) + expect(status.getMessage(status.MRT_ABORTED)).to.equal('Transaction was already aborted.') + }) + + it('AEROSPIKE_MRT_ALREADY_LOCKED', function () { + expect(status.AEROSPIKE_MRT_ALREADY_LOCKED).to.equal(126) + expect(status.MRT_ALREADY_LOCKED).to.equal(126) + expect(status.getMessage(status.MRT_ALREADY_LOCKED)).to.equal('This record has been locked by a previous update in this transaction.') + }) + + it('AEROSPIKE_MRT_MONITOR_EXISTS', function () { + expect(status.AEROSPIKE_MRT_MONITOR_EXISTS).to.equal(127) + expect(status.MRT_MONITOR_EXISTS).to.equal(127) + expect(status.getMessage(status.MRT_MONITOR_EXISTS)).to.equal('This transaction has already started. Writing to the same transaction with independent threads is unsafe.') + }) + + it('AEROSPIKE_ERR_BATCH_DISABLED', function () { + expect(status.AEROSPIKE_ERR_BATCH_DISABLED).to.equal(150) + expect(status.ERR_BATCH_DISABLED).to.equal(150) + expect(status.getMessage(status.ERR_BATCH_DISABLED)).to.equal('Batch functionality has been disabled.') + }) + + it('AEROSPIKE_ERR_BATCH_MAX_REQUESTS_EXCEEDED', function () { + expect(status.AEROSPIKE_ERR_BATCH_MAX_REQUESTS_EXCEEDED).to.equal(151) + expect(status.ERR_BATCH_MAX_REQUESTS_EXCEEDED).to.equal(151) + expect(status.getMessage(status.ERR_BATCH_MAX_REQUESTS_EXCEEDED)).to.equal('Batch max requests have been exceeded.') + }) + + it('AEROSPIKE_ERR_BATCH_QUEUES_FULL', function () { + expect(status.AEROSPIKE_ERR_BATCH_QUEUES_FULL).to.equal(152) + expect(status.ERR_BATCH_QUEUES_FULL).to.equal(152) + expect(status.getMessage(status.ERR_BATCH_QUEUES_FULL)).to.equal('All batch queues are full.') + }) + + it('AEROSPIKE_ERR_GEO_INVALID_GEOJSON', function () { + expect(status.AEROSPIKE_ERR_GEO_INVALID_GEOJSON).to.equal(160) + expect(status.ERR_GEO_INVALID_GEOJSON).to.equal(160) + expect(status.getMessage(status.ERR_GEO_INVALID_GEOJSON)).to.equal('Invalid/Unsupported GeoJSON.') + }) + + it('AEROSPIKE_ERR_INDEX_FOUND', function () { + expect(status.AEROSPIKE_ERR_INDEX_FOUND).to.equal(200) + expect(status.ERR_INDEX_FOUND).to.equal(200) + expect(status.getMessage(status.ERR_INDEX_FOUND)).to.equal('Index found.') + }) + + it('AEROSPIKE_ERR_INDEX_NOT_FOUND', function () { + expect(status.AEROSPIKE_ERR_INDEX_NOT_FOUND).to.equal(201) + expect(status.ERR_INDEX_NOT_FOUND).to.equal(201) + expect(status.getMessage(status.ERR_INDEX_NOT_FOUND)).to.equal('Index not found.') + }) + + it('AEROSPIKE_ERR_INDEX_OOM', function () { + expect(status.AEROSPIKE_ERR_INDEX_OOM).to.equal(202) + expect(status.ERR_INDEX_OOM).to.equal(202) + expect(status.getMessage(status.ERR_INDEX_OOM)).to.equal('Index is out of memory.') + }) + + it('AEROSPIKE_ERR_INDEX_NOT_READABLE', function () { + expect(status.AEROSPIKE_ERR_INDEX_NOT_READABLE).to.equal(203) + expect(status.ERR_INDEX_NOT_READABLE).to.equal(203) + expect(status.getMessage(status.ERR_INDEX_NOT_READABLE)).to.equal('Unable to read the index.') + }) + + it('AEROSPIKE_ERR_INDEX', function () { + expect(status.AEROSPIKE_ERR_INDEX).to.equal(204) + expect(status.ERR_INDEX).to.equal(204) + expect(status.getMessage(status.ERR_INDEX)).to.equal('Generic secondary index error.') + }) + + it('AEROSPIKE_ERR_INDEX_NAME_MAXLEN', function () { + expect(status.AEROSPIKE_ERR_INDEX_NAME_MAXLEN).to.equal(205) + expect(status.ERR_INDEX_NAME_MAXLEN).to.equal(205) + expect(status.getMessage(status.ERR_INDEX_NAME_MAXLEN)).to.equal('Index name is too long.') + }) + + it('AEROSPIKE_ERR_INDEX_MAXCOUNT', function () { + expect(status.AEROSPIKE_ERR_INDEX_MAXCOUNT).to.equal(206) + expect(status.ERR_INDEX_MAXCOUNT).to.equal(206) + expect(status.getMessage(status.ERR_INDEX_MAXCOUNT)).to.equal('System already has maximum allowed indices.') + }) + + it('AEROSPIKE_ERR_QUERY_ABORTED', function () { + expect(status.AEROSPIKE_ERR_QUERY_ABORTED).to.equal(210) + expect(status.ERR_QUERY_ABORTED).to.equal(210) + expect(status.getMessage(status.ERR_QUERY_ABORTED)).to.equal('Query was aborted.') + }) + + it('AEROSPIKE_ERR_QUERY_QUEUE_FULL', function () { + expect(status.AEROSPIKE_ERR_QUERY_QUEUE_FULL).to.equal(211) + expect(status.ERR_QUERY_QUEUE_FULL).to.equal(211) + expect(status.getMessage(status.ERR_QUERY_QUEUE_FULL)).to.equal('Query processing queue is full.') + }) + + it('AEROSPIKE_ERR_QUERY_TIMEOUT', function () { + expect(status.AEROSPIKE_ERR_QUERY_TIMEOUT).to.equal(212) + expect(status.ERR_QUERY_TIMEOUT).to.equal(212) + expect(status.getMessage(status.ERR_QUERY_TIMEOUT)).to.equal('Secondary index query timed out on server.') + }) + + it('AEROSPIKE_ERR_QUERY', function () { + expect(status.AEROSPIKE_ERR_QUERY).to.equal(213) + expect(status.ERR_QUERY).to.equal(213) + expect(status.getMessage(status.ERR_QUERY)).to.equal('Generic query error.') + }) + + it('AEROSPIKE_ERR_UDF_NOT_FOUND', function () { + expect(status.AEROSPIKE_ERR_UDF_NOT_FOUND).to.equal(1301) + expect(status.ERR_UDF_NOT_FOUND).to.equal(1301) + expect(status.getMessage(status.ERR_UDF_NOT_FOUND)).to.equal('UDF does not exist.') + }) + + it('AEROSPIKE_ERR_LUA_FILE_NOT_FOUND', function () { + expect(status.AEROSPIKE_ERR_LUA_FILE_NOT_FOUND).to.equal(1302) + expect(status.ERR_LUA_FILE_NOT_FOUND).to.equal(1302) + expect(status.getMessage(status.ERR_LUA_FILE_NOT_FOUND)).to.equal('LUA file does not exist.') + }) + +}) \ No newline at end of file diff --git a/ts-test/tests/test_helper.ts b/ts-test/tests/test_helper.ts index f23657f43..4447cbcd4 100644 --- a/ts-test/tests/test_helper.ts +++ b/ts-test/tests/test_helper.ts @@ -244,15 +244,11 @@ Aerospike.setDefaultLogging(config.log ?? {}) export function skipUnlessVersionAndEnterprise (this: any, versionRange: any, ctx: Suite) { skipUnless(ctx, () => { - console.log(this.cluster.isVersionInRange(versionRange)) - console.log((!this.cluster.isEnterprise())) return (this.cluster.isVersionInRange(versionRange) && (this.cluster.isEnterprise())) }, `cluster version does not meet requirements: "${versionRange} and/or requires enterprise"`) } export function skipUnlessVersionAndCommunity (this: any, versionRange: any, ctx: Suite) { skipUnless(ctx, () => { - console.log(this.cluster.isVersionInRange(versionRange)) - console.log((!this.cluster.isEnterprise())) return (this.cluster.isVersionInRange(versionRange) && (!this.cluster.isEnterprise())) }, `cluster version does not meet requirements: "${versionRange} and/or requires enterprise"`) diff --git a/typings/index.d.ts b/typings/index.d.ts index 08468ffea..0a15241c6 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -470,24 +470,21 @@ export class Transaction { */ OK: 0, - /** - * Transaction has already been committed. - */ - ALREADY_COMMITTED: 1, /** * Transaction has already been aborted. */ - ALREADY_ABORTED: 2, + ALREADY_ABORTED: 1, + /** * Client roll back abandoned. Server will eventually abort the transaction. */ - ROLL_BACK_ABANDONED: 3, + ROLL_BACK_ABANDONED: 2, /** * Transaction has been rolled back, but client transaction close was abandoned. * Server will eventually close the transaction. */ - CLOSE_ABANDONED: 4 + CLOSE_ABANDONED: 3 }; @@ -504,31 +501,28 @@ export class Transaction { * Transaction has already been committed. */ ALREADY_COMMITTED: 1, - /** - * Transaction has already been aborted. - */ - ALREADY_ABORTED: 2, + /** * Transaction verify failed. Transaction will be aborted. */ - VERIFY_FAILED: 3, + VERIFY_FAILED: 2, /** * Transaction mark roll forward abandoned. Transaction will be aborted when error is not in doubt. * If the error is in doubt (usually timeout), the commit is in doubt. */ - MARK_ROLL_FORWARD_ABANDONED: 4, + MARK_ROLL_FORWARD_ABANDONED: 3, /** * Client roll forward abandoned. Server will eventually commit the transaction. */ - ROLL_FORWARD_ABANDONED: 5, + ROLL_FORWARD_ABANDONED: 4, /** * Transaction has been rolled forward, but client transaction close was abandoned. * Server will eventually close the transaction. */ - CLOSE_ABANDONED: 6 + CLOSE_ABANDONED: 5 }; private prepareToClose(): void; @@ -767,6 +761,8 @@ export class Transaction { * * If the MRT timeout is zero, the server configuration mrt-duration is used. The default mrt-duration is 10 seconds. * + * Default Client transaction timeout is 0. + * * @param timeout - MRT timeout in seconds * * @example @@ -16086,6 +16082,22 @@ export namespace filter { declare namespace statusNamespace { + /** + * Multi-record transaction commit called, but the transaction was already aborted. + */ + export const AEROSPIKE_TXN_ALREADY_ABORTED = -19; + /** + * Multi-record transaction commit called, but the transaction was already aborted. + */ + export const TXN_ALREADY_ABORTED = -19; + /** + * Multi-record transaction abort called, but the transaction was already committed. + */ + export const AEROSPIKE_TXN_ALREADY_COMMITTED = -18; + /** + * Multi-record transaction abort called, but the transaction was already committed. + */ + export const TXN_ALREADY_COMMITTED = -18; /** * Multi-record transaction failed. */ @@ -16732,6 +16744,22 @@ x */ * MRT was already aborted. */ export const MRT_ABORTED = 125; + /** + * This record has been locked by a previous update in this transaction. + */ + export const AEROSPIKE_MRT_ALREADY_LOCKED = 126; + /** + * This record has been locked by a previous update in this transaction. + */ + export const MRT_ALREADY_LOCKED = 126; + /** + * This transaction has already started. Writing to the same transaction with independent threads is unsafe. + */ + export const AEROSPIKE_MRT_MONITOR_EXISTS = 127; + /** + * This transaction has already started. Writing to the same transaction with independent threads is unsafe. + */ + export const MRT_MONITOR_EXISTS = 127; /** * Batch functionality has been disabled. */ From 62852186818428cbbbdaa5bf0bec4759f9318904 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 16 Jan 2025 04:18:31 -0700 Subject: [PATCH 238/417] Fixed MRT tests for enterprise servers. --- ts-test/tests/mrt_api.ts | 18 +++++++++--------- ts-test/tests/mrt_functionality.ts | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ts-test/tests/mrt_api.ts b/ts-test/tests/mrt_api.ts index 045bc4d42..5e99ceac5 100644 --- a/ts-test/tests/mrt_api.ts +++ b/ts-test/tests/mrt_api.ts @@ -104,35 +104,35 @@ describe('MRT API Tests', function () { expect(Aerospike.Transaction.abortStatus.OK).to.equal(0) }) it('ALREADY_ABORTED', async function () { - expect(Aerospike.Transaction.abortStatus.ALREADY_ABORTED).to.equal(0) + expect(Aerospike.Transaction.abortStatus.ALREADY_ABORTED).to.equal(1) }) it('ROLL_BACK_ABANDONED', async function () { - expect(Aerospike.Transaction.abortStatus.ROLL_BACK_ABANDONED).to.equal(0) + expect(Aerospike.Transaction.abortStatus.ROLL_BACK_ABANDONED).to.equal(2) }) it('CLOSE_ABANDONED', async function () { - expect(Aerospike.Transaction.abortStatus.CLOSE_ABANDONED).to.equal(0) + expect(Aerospike.Transaction.abortStatus.CLOSE_ABANDONED).to.equal(3) }) }) - + context('transaction.commitStatus', function () { it('OK', async function () { expect(Aerospike.Transaction.commitStatus.OK).to.equal(0) }) it('ALREADY_COMMITTED', async function () { - expect(Aerospike.Transaction.commitStatus.ALREADY_COMMITTED).to.equal(0) + expect(Aerospike.Transaction.commitStatus.ALREADY_COMMITTED).to.equal(1) }) it('VERIFY_FAILED', async function () { - expect(Aerospike.Transaction.commitStatus.VERIFY_FAILED).to.equal(0) + expect(Aerospike.Transaction.commitStatus.VERIFY_FAILED).to.equal(2) }) it('MARK_ROLL_FORWARD_ABANDONED', async function () { - expect(Aerospike.Transaction.commitStatus.MARK_ROLL_FORWARD_ABANDONED).to.equal(0) + expect(Aerospike.Transaction.commitStatus.MARK_ROLL_FORWARD_ABANDONED).to.equal(3) }) it('ROLL_FORWARD_ABANDONED', async function () { - expect(Aerospike.Transaction.commitStatus.ROLL_FORWARD_ABANDONED).to.equal(0) + expect(Aerospike.Transaction.commitStatus.ROLL_FORWARD_ABANDONED).to.equal(4) }) it('CLOSE_ABANDONED', async function () { - expect(Aerospike.Transaction.commitStatus.CLOSE_ABANDONED).to.equal(0) + expect(Aerospike.Transaction.commitStatus.CLOSE_ABANDONED).to.equal(5) }) }) diff --git a/ts-test/tests/mrt_functionality.ts b/ts-test/tests/mrt_functionality.ts index 93da1cce5..c44e29770 100644 --- a/ts-test/tests/mrt_functionality.ts +++ b/ts-test/tests/mrt_functionality.ts @@ -158,6 +158,7 @@ describe('MRT functionality tests', function () { } catch (error: any) { expect(error.code).to.eql(Aerospike.status.TXN_ALREADY_ABORTED) + return } assert.fail('An ALREADY_ABORTED error should have been thrown') @@ -180,6 +181,7 @@ describe('MRT functionality tests', function () { } catch (error: any) { expect(error.code).to.eql(Aerospike.status.TXN_ALREADY_COMMITTED) + return } assert.fail('An ALREADY_COMMITTED error should have been thrown') From 15613f21b5c47e316a1073ab6d9b118648aa5919 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 16 Jan 2025 04:50:23 -0700 Subject: [PATCH 239/417] Fixed MRT tests. --- package.json | 2 +- ts-test/tests/batch_remove.ts | 5 ++--- ts-test/tests/mrt_functionality.ts | 2 -- ts-test/tests/query.ts | 4 ++-- ts-test/tests/scan.ts | 4 ++-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index aa5e1b213..d9e273539 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "apidocs": "jsdoc -c jsdoc.json", "build-docs": "npx typedoc --plugin typedoc-plugin-rename-defaults --entryPointStrategy expand typings/index.d.ts", "cppcheck": "cppcheck --quiet --enable=warning,style -I src/include src/main/", - "valgrind": "valgrind node ./node_modules/mocha/bin/_mocha -R dot -g '#slow' -i", + "valgrind": "cd ts-test; valgrind node ./node_modules/mocha/bin/_mocha -R dot -g '#slow' -i dist/${npm_config_testfile:-}", "prepare": "husky install", "removeExtraBinaries": "node ./scripts/prebuiltBinding.js" }, diff --git a/ts-test/tests/batch_remove.ts b/ts-test/tests/batch_remove.ts index b1bb41c55..c958b1017 100644 --- a/ts-test/tests/batch_remove.ts +++ b/ts-test/tests/batch_remove.ts @@ -85,11 +85,10 @@ describe('client.batchRemove()', function () { new Key(helper.namespace, helper.set, 'test/batch_remove/0') ] try { - await client.batchRemove(batchRecords, null, new Aerospike.BatchRemovePolicy({ gen: Aerospike.policy.gen.EQ, generation: 10 })) + await client.batchRemove(batchRecords, null, new Aerospike.BatchRemovePolicy({ gen: Aerospike.policy.gen.IGNORE, generation: 10 }) // Will fail if code makes it here - expect(1).to.eql(2) + assert.fail('An error should have been caught') } catch (error: any) { - // code will fail with undefined if expect(1).to.eql(2) executes expect(error.code).to.eql(-16) const results: BatchResult[] = await client.batchRemove(batchRecords) expect(results.length).to.equal(5) diff --git a/ts-test/tests/mrt_functionality.ts b/ts-test/tests/mrt_functionality.ts index c44e29770..2ae68f952 100644 --- a/ts-test/tests/mrt_functionality.ts +++ b/ts-test/tests/mrt_functionality.ts @@ -151,7 +151,6 @@ describe('MRT functionality tests', function () { let result: number = await client.abort(mrt) - result = await client.commit(mrt) try{ await client.commit(mrt) @@ -175,7 +174,6 @@ describe('MRT functionality tests', function () { let result: number = await client.commit(mrt) - result = await client.abort(mrt) try{ await client.abort(mrt) } diff --git a/ts-test/tests/query.ts b/ts-test/tests/query.ts index a30e2b86e..45cce650d 100644 --- a/ts-test/tests/query.ts +++ b/ts-test/tests/query.ts @@ -1130,7 +1130,7 @@ describe('Queries', function () { const key = keys[Math.floor(Math.random() * keys.length)] const record = await client.get(key) expect(record.ttl).to.equal(3599) - expect(record.ttl).to.be.within(3599, 3600) + expect(record.ttl).to.be.within(3598, 3600) }) @@ -1142,7 +1142,7 @@ describe('Queries', function () { const key = keys[Math.floor(Math.random() * keys.length)] const record = await client.get(key) - expect(record.ttl).to.be.within(7199, 7200) + expect(record.ttl).to.be.within(7198, 7200) }) }) diff --git a/ts-test/tests/scan.ts b/ts-test/tests/scan.ts index 45722e999..86e85fd6a 100644 --- a/ts-test/tests/scan.ts +++ b/ts-test/tests/scan.ts @@ -398,7 +398,7 @@ context('Scans', function () { const key: any = keys[Math.floor(Math.random() * keys.length)] const record = await client.get(key) - expect(record.ttl).to.be.within(10799, 10800) + expect(record.ttl).to.be.within(10798, 10800) }) it('should set TTL to the specified value with scan options #slow', async function () { @@ -410,7 +410,7 @@ context('Scans', function () { const key: any = keys[Math.floor(Math.random() * keys.length)] const record = await client.get(key) expect(record.ttl).to.equal(14399) - expect(record.ttl).to.be.within(14399, 14400) + expect(record.ttl).to.be.within(14398, 14400) }) From c0e840e1c40b2c184f964f6e1e07f3a7ef9092f4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 16 Jan 2025 05:00:19 -0700 Subject: [PATCH 240/417] Typo fix --- ts-test/tests/batch_remove.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-test/tests/batch_remove.ts b/ts-test/tests/batch_remove.ts index c958b1017..ecca6e4c2 100644 --- a/ts-test/tests/batch_remove.ts +++ b/ts-test/tests/batch_remove.ts @@ -85,7 +85,7 @@ describe('client.batchRemove()', function () { new Key(helper.namespace, helper.set, 'test/batch_remove/0') ] try { - await client.batchRemove(batchRecords, null, new Aerospike.BatchRemovePolicy({ gen: Aerospike.policy.gen.IGNORE, generation: 10 }) + await client.batchRemove(batchRecords, null, new Aerospike.BatchRemovePolicy({ gen: Aerospike.policy.gen.EQ, generation: 10 })) // Will fail if code makes it here assert.fail('An error should have been caught') } catch (error: any) { From c901bafeaf56966a61c0bdc5257a45de7613a7af Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 16 Jan 2025 05:05:43 -0700 Subject: [PATCH 241/417] Test fix --- ts-test/tests/batch_remove.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-test/tests/batch_remove.ts b/ts-test/tests/batch_remove.ts index ecca6e4c2..e168fefb4 100644 --- a/ts-test/tests/batch_remove.ts +++ b/ts-test/tests/batch_remove.ts @@ -22,7 +22,7 @@ import Aerospike, { AerospikeError, Client, Key as K, BatchResult} from 'aerospike'; import * as helper from './test_helper'; -import { expect } from 'chai'; +import { expect, assert} from 'chai'; // const util = require('util') const keygen = helper.keygen From 7022bd89b3f7e22d097eb3be7d3d1464aceb8940 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:09:29 -0700 Subject: [PATCH 242/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 12 ++++++ .github/workflows/stage-tests.yml | 2 - .../workflows/upload-jfrog-build-to-npm.yml | 37 +++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/upload-jfrog-build-to-npm.yml diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 9f57352c7..175816727 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -51,6 +51,18 @@ jobs: version: ${{ needs.bump-dev-number.outputs.new_version }} #secrets: inherit + publish-to-npm: + name: Upload artifacts to JFrog + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num, + upload-to-jfrog + ] + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + #secrets: inherit + # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: # needs: upload-to-jfrog diff --git a/.github/workflows/stage-tests.yml b/.github/workflows/stage-tests.yml index a7664a3e0..10e478534 100644 --- a/.github/workflows/stage-tests.yml +++ b/.github/workflows/stage-tests.yml @@ -93,7 +93,6 @@ jobs: wheel_os: manylinux wheel_cpu_arch: ${{ env.DISTRO_DOCKER_IMAGE_PLATFORM == 'linux/amd64' && 'x86_64' || 'aarch64' }} JFROG_PLATFORM_URL: ${{ secrets.JFROG_PLATFORM_URL }} - JFROG_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }} JFROG_REPO_NAME: ${{ vars.JFROG_REPO_NAME }} - uses: ./.github/actions/run-ee-server @@ -179,7 +178,6 @@ jobs: wheel_os: macosx wheel_cpu_arch: x86_64 JFROG_PLATFORM_URL: ${{ secrets.JFROG_PLATFORM_URL }} - JFROG_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }} JFROG_REPO_NAME: ${{ vars.JFROG_REPO_NAME }} - uses: actions/setup-python@v4 diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml new file mode 100644 index 000000000..478ee4ca2 --- /dev/null +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -0,0 +1,37 @@ +name: Publish JFrog build to PyPI +on: + workflow_dispatch: + inputs: + version: + type: string + description: Build version + required: true + #use-test-pypi: + # type: boolean + # description: 'DEBUG: upload to test.pypi.org?' + # required: true + # default: false + +jobs: + publish-jfrog-build-to-npm: + runs-on: ubuntu-22.04 + steps: + - name: Set up JFrog credentials + uses: jfrog/setup-jfrog-cli@4 + env: + JF_URL: https://aerospike.jfrog.io + with: + oidc-provider-name: gh-aerospike-clients + oidc-audience: aerospike/clients + + #- name: Download JFrog build + # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} + - name: npm install from JFrog + run: | + jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.2 + ls . + + #- run: npm ci + #- run: npm publish --provenance --access public + # env: + # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file From 20b16ebdc44da48fc7c04219b29fe7a61eb75dc9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:15:02 -0700 Subject: [PATCH 243/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 478ee4ca2..e051ba4d3 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -28,9 +28,10 @@ jobs: # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} - name: npm install from JFrog run: | - jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.2 + jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.3 ls . + #- run: npm ci #- run: npm publish --provenance --access public # env: From df86455a85ba74fb5240324eb47a7a0d52b86de5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:30:46 -0700 Subject: [PATCH 244/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 2 +- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 175816727..94c4634c0 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -58,7 +58,7 @@ jobs: rebuild-artifacts-with-new-dev-num, upload-to-jfrog ] - uses: ./.github/workflows/upload-to-jfrog.yml + uses: ./.github/workflows/upload-jfrog-build-to-npm.yml with: version: ${{ needs.bump-dev-number.outputs.new_version }} #secrets: inherit diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index e051ba4d3..d6cbaee7c 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -28,7 +28,7 @@ jobs: # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} - name: npm install from JFrog run: | - jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.3 + jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.4 ls . diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 8404a772c..763589034 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -62,9 +62,9 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.2 + NEW_VERSION: 6.0.3-dev.4 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.2 \ No newline at end of file + run: jf rt build-publish nodejs-client 6.0.3-dev.4 \ No newline at end of file From cfe3262fa84dc7c6624a48764a2cb3d612020d37 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:35:22 -0700 Subject: [PATCH 245/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index d6cbaee7c..c59d84ed1 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -11,6 +11,7 @@ on: # description: 'DEBUG: upload to test.pypi.org?' # required: true # default: false + workflow_call: jobs: publish-jfrog-build-to-npm: From 97aca0a707dfdb6ff4ebfcb65b98b05d1d3135fe Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:40:40 -0700 Subject: [PATCH 246/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 4 ---- .github/workflows/upload-jfrog-build-to-npm.yml | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 94c4634c0..62d1e3fcc 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -47,8 +47,6 @@ jobs: rebuild-artifacts-with-new-dev-num ] uses: ./.github/workflows/upload-to-jfrog.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} #secrets: inherit publish-to-npm: @@ -59,8 +57,6 @@ jobs: upload-to-jfrog ] uses: ./.github/workflows/upload-jfrog-build-to-npm.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} #secrets: inherit # # We don't want the artifacts in JFrog to also exist in Github diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index c59d84ed1..db585303a 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -12,6 +12,11 @@ on: # required: true # default: false workflow_call: + inputs: + version: + type: string + description: Build version + required: true jobs: publish-jfrog-build-to-npm: From d23d40245459a7a7b56614681a27bf2ba11bda96 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:41:11 -0700 Subject: [PATCH 247/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 62d1e3fcc..94c4634c0 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -47,6 +47,8 @@ jobs: rebuild-artifacts-with-new-dev-num ] uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} #secrets: inherit publish-to-npm: @@ -57,6 +59,8 @@ jobs: upload-to-jfrog ] uses: ./.github/workflows/upload-jfrog-build-to-npm.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} #secrets: inherit # # We don't want the artifacts in JFrog to also exist in Github From 2164e6afc72b94ac4b9f4e486e72abd6d1dbdd53 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:46:36 -0700 Subject: [PATCH 248/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- .github/workflows/upload-to-jfrog.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index db585303a..098305f0b 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Set up JFrog credentials - uses: jfrog/setup-jfrog-cli@4 + uses: jfrog/setup-jfrog-cli@v4 env: JF_URL: https://aerospike.jfrog.io with: diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 763589034..e1ffea0cf 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -41,7 +41,7 @@ jobs: path: artifacts - name: Set up JFrog credentials - uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 + uses: jfrog/setup-jfrog-cli@v4 env: JF_URL: https://aerospike.jfrog.io with: From 7405e736569f5075c3b806b6bc46193203093a89 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 07:52:46 -0700 Subject: [PATCH 249/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 098305f0b..82f95a7d8 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -1,4 +1,9 @@ name: Publish JFrog build to PyPI + +permissions: + # This is required for requesting the OIDC token + id-token: write + on: workflow_dispatch: inputs: From 264be9271ced8fc3624e6fecff3c411da634b0d2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 08:02:29 -0700 Subject: [PATCH 250/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 82f95a7d8..f1aff5df6 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -39,6 +39,7 @@ jobs: # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} - name: npm install from JFrog run: | + jf npm-config jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.4 ls . From 21a118ab72c26e3e1c2a6aa6ba93ff14e26e04e6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 08:04:07 -0700 Subject: [PATCH 251/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f1aff5df6..c86e60326 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -39,7 +39,7 @@ jobs: # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} - name: npm install from JFrog run: | - jf npm-config + jf npm-config clients-npm-dev-local jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.4 ls . From 6e58bcd3a9545888cace2b31157e83831833a31d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 08:16:08 -0700 Subject: [PATCH 252/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index c86e60326..d1e74667f 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -39,7 +39,7 @@ jobs: # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} - name: npm install from JFrog run: | - jf npm-config clients-npm-dev-local + jf npm-config --repo-deploy clients-npm-dev-local jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.4 ls . From 2aab2734d2a21b42fa3809d0404bca772dd23df2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 08:45:20 -0700 Subject: [PATCH 253/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 94c4634c0..ee52bab2b 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,31 +25,31 @@ jobs: # uses: ./.github/workflows/release-package.yml # secrets: inherit - rebuild-artifacts-with-new-dev-num: - #needs: bump-dev-number - name: Rebuild artifacts with new dev number - uses: ./.github/workflows/build-artifacts.yml - with: - # On pull_request_target, the bump version commit will be ignored - # So we must pass it manually to the workflow - sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} - secrets: inherit +# rebuild-artifacts-with-new-dev-num: +# #needs: bump-dev-number +# name: Rebuild artifacts with new dev number +# uses: ./.github/workflows/build-artifacts.yml +# with: +# # On pull_request_target, the bump version commit will be ignored +# # So we must pass it manually to the workflow +# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} +# secrets: inherit # test-npm-install: # needs: rebuild-artifacts-with-new-dev-num # name: Test npm install command for npm package # uses: ./.github/workflows/npm-install-script-test.yml - upload-to-jfrog: - name: Upload artifacts to JFrog - needs: [ - # bump-dev-number, - rebuild-artifacts-with-new-dev-num - ] - uses: ./.github/workflows/upload-to-jfrog.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - #secrets: inherit +# upload-to-jfrog: +# name: Upload artifacts to JFrog +# needs: [ +# # bump-dev-number, +# rebuild-artifacts-with-new-dev-num +# ] +# uses: ./.github/workflows/upload-to-jfrog.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# #secrets: inherit publish-to-npm: name: Upload artifacts to JFrog From 739eb61b430cadbfdd33c2f37125dae2db4caeef Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 08:45:51 -0700 Subject: [PATCH 254/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index ee52bab2b..33f961093 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -55,8 +55,8 @@ jobs: name: Upload artifacts to JFrog needs: [ # bump-dev-number, - rebuild-artifacts-with-new-dev-num, - upload-to-jfrog + # rebuild-artifacts-with-new-dev-num, + # upload-to-jfrog ] uses: ./.github/workflows/upload-jfrog-build-to-npm.yml with: From b2148de3c199d064f5d7555b999a9efa13625f2a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:02:09 -0700 Subject: [PATCH 255/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 6 ++--- .../workflows/upload-jfrog-build-to-npm.yml | 22 ++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 33f961093..b7742c5ef 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -53,15 +53,15 @@ jobs: publish-to-npm: name: Upload artifacts to JFrog - needs: [ + #needs: [ # bump-dev-number, # rebuild-artifacts-with-new-dev-num, # upload-to-jfrog - ] + #] uses: ./.github/workflows/upload-jfrog-build-to-npm.yml with: version: ${{ needs.bump-dev-number.outputs.new_version }} - #secrets: inherit + secrets: inherit # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index d1e74667f..9b8a808d2 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -22,6 +22,10 @@ on: type: string description: Build version required: true + secrets: + # Just make all the secrets required to make things simpler... + NPMRC: + required: true jobs: publish-jfrog-build-to-npm: @@ -35,13 +39,21 @@ jobs: oidc-provider-name: gh-aerospike-clients oidc-audience: aerospike/clients + - name: npm rc + run: echo $FEATURE_FILE | base64 --decode > ~/features.conf + env: + FEATURE_FILE: ${{ secrets.NPMRC }} + + - name: npm login + run: npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web + #- name: Download JFrog build # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} - - name: npm install from JFrog - run: | - jf npm-config --repo-deploy clients-npm-dev-local - jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.4 - ls . + #- name: npm install from JFrog + # run: | + # jf npm-config --repo-deploy --repo-resolve clients-npm-dev-local + # jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.4 + # ls . #- run: npm ci From 0c206127032ef60b9142bc3255252f29bbbf2f63 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:09:10 -0700 Subject: [PATCH 256/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 9b8a808d2..627142ea3 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -40,9 +40,9 @@ jobs: oidc-audience: aerospike/clients - name: npm rc - run: echo $FEATURE_FILE | base64 --decode > ~/features.conf + run: echo $NPMRC | base64 --decode > ~/.npmrc env: - FEATURE_FILE: ${{ secrets.NPMRC }} + NPMRC: ${{ secrets.NPMRC }} - name: npm login run: npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web From db7400f722e04543d279df82019057a49c1cd8ec Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:12:53 -0700 Subject: [PATCH 257/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 627142ea3..e99947850 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -44,6 +44,7 @@ jobs: env: NPMRC: ${{ secrets.NPMRC }} + - name: npm login run: npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web From e7461a2dd491031a993dee05ab011c7b33f955da Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:18:29 -0700 Subject: [PATCH 258/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index e99947850..627142ea3 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -44,7 +44,6 @@ jobs: env: NPMRC: ${{ secrets.NPMRC }} - - name: npm login run: npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web From d5b27f44b04c183afd5e1541d89322ba9d2d08f6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:20:35 -0700 Subject: [PATCH 259/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 627142ea3..2033824fd 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -40,7 +40,7 @@ jobs: oidc-audience: aerospike/clients - name: npm rc - run: echo $NPMRC | base64 --decode > ~/.npmrc + run: echo "$NPMRC" | base64 --decode > ~/.npmrc env: NPMRC: ${{ secrets.NPMRC }} From 2eca0cf8b94958913c055075b85573893ec471a3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:27:00 -0700 Subject: [PATCH 260/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 2033824fd..7c0838071 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -45,8 +45,10 @@ jobs: NPMRC: ${{ secrets.NPMRC }} - name: npm login - run: npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web - + run: | + npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web + npm get registry + npm install aerospike@6.0.3.dev4 #- name: Download JFrog build # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} #- name: npm install from JFrog From e591cd1b0b453fd7b0cc8d5316aa008218326457 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:29:06 -0700 Subject: [PATCH 261/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 7c0838071..3ad697983 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -48,7 +48,7 @@ jobs: run: | npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web npm get registry - npm install aerospike@6.0.3.dev4 + npm install aerospike@6.0.3-dev.4 #- name: Download JFrog build # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} #- name: npm install from JFrog From ef1c731ac483761248bc21961f4136248894cc51 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:36:52 -0700 Subject: [PATCH 262/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 3ad697983..f75c7f141 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -47,8 +47,17 @@ jobs: - name: npm login run: | npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web + + - name: npm get registry + run: | npm get registry + + - name: npm get publish + npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + - name: npm install + run: | npm install aerospike@6.0.3-dev.4 + #- name: Download JFrog build # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} #- name: npm install from JFrog From 84782af327ed12b2c5243f7d28eb0fa90231de4f Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:38:27 -0700 Subject: [PATCH 263/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f75c7f141..111c0f50f 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -53,7 +53,10 @@ jobs: npm get registry - name: npm get publish + run: | + npm version 6.0.3-dev.4 --no-git-tag-version npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + - name: npm install run: | npm install aerospike@6.0.3-dev.4 From b00e90677b9b4871e2c96e17f8a31923bb1b2060 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:40:11 -0700 Subject: [PATCH 264/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 111c0f50f..03f8c1063 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -54,6 +54,7 @@ jobs: - name: npm get publish run: | + cat package.json npm version 6.0.3-dev.4 --no-git-tag-version npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ From cf937ee65ab8a7d5b9217740d079bb2143f5b369 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:41:10 -0700 Subject: [PATCH 265/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 03f8c1063..6eb74ece3 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -31,6 +31,13 @@ jobs: publish-jfrog-build-to-npm: runs-on: ubuntu-22.04 steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + ref: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }} + # We need the last tag before the ref, so we can relabel the version if needed + fetch-depth: 0 + - name: Set up JFrog credentials uses: jfrog/setup-jfrog-cli@v4 env: From af00e7a83bbf66594a2a74ad6e3358ee80c2f0d1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:42:27 -0700 Subject: [PATCH 266/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 6eb74ece3..ff83e487a 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,6 +63,8 @@ jobs: run: | cat package.json npm version 6.0.3-dev.4 --no-git-tag-version + ./scripts/build-c-client/sh; + npm install; npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ - name: npm install From 3601fba71a101935c56897633cc171d6f883e190 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:44:28 -0700 Subject: [PATCH 267/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index ff83e487a..c121722b8 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,7 +63,7 @@ jobs: run: | cat package.json npm version 6.0.3-dev.4 --no-git-tag-version - ./scripts/build-c-client/sh; + ./scripts/build-c-client.sh; npm install; npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ From d0bb3666c983614a7997a152f6d936e79e161ae2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:46:35 -0700 Subject: [PATCH 268/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index c121722b8..101f3ea8e 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -51,9 +51,9 @@ jobs: env: NPMRC: ${{ secrets.NPMRC }} - - name: npm login - run: | - npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web + #- name: npm login + # run: | + # npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web - name: npm get registry run: | From 62dc5dd0683d2910958326d4523f7f151941f37e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:50:24 -0700 Subject: [PATCH 269/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 101f3ea8e..f622201c2 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -47,9 +47,9 @@ jobs: oidc-audience: aerospike/clients - name: npm rc - run: echo "$NPMRC" | base64 --decode > ~/.npmrc + run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc env: - NPMRC: ${{ secrets.NPMRC }} + NPMRC: ${{ secrets.NPMRC_OFF }} #- name: npm login # run: | From d40fa82b769889e372680778175ea923338dd340 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:55:49 -0700 Subject: [PATCH 270/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f622201c2..c13df46b4 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -59,14 +59,25 @@ jobs: run: | npm get registry - - name: npm get publish + - name: build pack run: | cat package.json npm version 6.0.3-dev.4 --no-git-tag-version ./scripts/build-c-client.sh; + npm install; npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + + - name: npm rc + run: echo "$NPMRC" | base64 --decode > ~/.npmrc + + - name: npm publish + run: | + npm install; + npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + + - name: npm install run: | npm install aerospike@6.0.3-dev.4 From deec6a159cd9bf07eeb1ce88fc5c0aea88dba273 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 09:58:47 -0700 Subject: [PATCH 271/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index c13df46b4..26b9207a8 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -65,9 +65,6 @@ jobs: npm version 6.0.3-dev.4 --no-git-tag-version ./scripts/build-c-client.sh; - npm install; - npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ - - name: npm rc run: echo "$NPMRC" | base64 --decode > ~/.npmrc From e067d1a277664c1cbe355b1bf7444b98d08c0fb3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:03:59 -0700 Subject: [PATCH 272/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 11 +++++++++-- package-lock.json | 9 ++++++++- package.json | 3 ++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 26b9207a8..111763e7a 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -64,14 +64,21 @@ jobs: cat package.json npm version 6.0.3-dev.4 --no-git-tag-version ./scripts/build-c-client.sh; - + npm install; - name: npm rc run: echo "$NPMRC" | base64 --decode > ~/.npmrc + - name: npm get registry + run: | + npm get registry + + - name: npm login + run: | + npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web + - name: npm publish run: | - npm install; npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ diff --git a/package-lock.json b/package-lock.json index b96ea9745..c4a914e2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,8 @@ "minimatch": "^3.1.2", "nan": "^2.22.0", "node-gyp": "^10.1.0", - "npm-run-all": "^4.1.5" + "npm-run-all": "^4.1.5", + "user": "^0.0.0" }, "devDependencies": { "@eslint/js": "^9.12.0", @@ -8046,6 +8047,12 @@ "fast-url-parser": "^1.1.3" } }, + "node_modules/user": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/user/-/user-0.0.0.tgz", + "integrity": "sha512-eRNM5isOvr6aEFAGi1CqAkmLkYxW2NJ5ThhbD+6IJXYKM1mo7Gtxx4mQIveHz/5K3p/SVnlW9k17ETn+QAu8IQ==", + "license": "MIT" + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index b9e36ad25..998fe47c4 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,8 @@ "minimatch": "^3.1.2", "nan": "^2.22.0", "node-gyp": "^10.1.0", - "npm-run-all": "^4.1.5" + "npm-run-all": "^4.1.5", + "user": "^0.0.0" }, "devDependencies": { "@eslint/js": "^9.12.0", From 753e9e61886d10ef4731666f2f77d13c23de87b0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:07:38 -0700 Subject: [PATCH 273/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 111763e7a..29bff2271 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -46,6 +46,10 @@ jobs: oidc-provider-name: gh-aerospike-clients oidc-audience: aerospike/clients + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.nodejs-tag[1] }} + - name: npm rc run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc env: From 1e351dd1d791d42faea5344c521c1e2dfdeb3906 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:13:38 -0700 Subject: [PATCH 274/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 29bff2271..33720e3e3 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: ${{ matrix.nodejs-tag[1] }} - + - name: npm rc run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc env: @@ -73,14 +73,16 @@ jobs: - name: npm rc run: echo "$NPMRC" | base64 --decode > ~/.npmrc - - name: npm get registry - run: | - npm get registry - name: npm login run: | npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web + + - name: npm get registry + run: | + npm get registry + - name: npm publish run: | npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ From 16663487ab39ac302651f6a10c70c6b197988684 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:14:56 -0700 Subject: [PATCH 275/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 33720e3e3..44b9f7159 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -82,7 +82,8 @@ jobs: - name: npm get registry run: | npm get registry - + npm -v + - name: npm publish run: | npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ From 96cea9dcdd52786c3812e552ae14c88a70a96cb6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:22:43 -0700 Subject: [PATCH 276/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 44b9f7159..f187b78e0 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -76,7 +76,7 @@ jobs: - name: npm login run: | - npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web + npm login - name: npm get registry From a61b84a380f34481662b717ff9c4e0b8534dc9e3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:26:59 -0700 Subject: [PATCH 277/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f187b78e0..0afe4809d 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -53,7 +53,7 @@ jobs: - name: npm rc run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc env: - NPMRC: ${{ secrets.NPMRC_OFF }} + NPMRC_OFF: ${{ secrets.NPMRC_OFF }} #- name: npm login # run: | @@ -72,6 +72,7 @@ jobs: - name: npm rc run: echo "$NPMRC" | base64 --decode > ~/.npmrc + NPMRC: ${{ secrets.NPMRC }} - name: npm login From 5ae7866fb001609418dde3e8db6e428b25d6b50b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:32:22 -0700 Subject: [PATCH 278/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 0afe4809d..9e984762c 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -26,6 +26,8 @@ on: # Just make all the secrets required to make things simpler... NPMRC: required: true + NPMRC_OFF: + required: true jobs: publish-jfrog-build-to-npm: @@ -70,8 +72,10 @@ jobs: ./scripts/build-c-client.sh; npm install; - - name: npm rc - run: echo "$NPMRC" | base64 --decode > ~/.npmrc + - name: npm rc 2 + run: | + echo "$NPMRC" | base64 --decode > ~/.npmrc + env: NPMRC: ${{ secrets.NPMRC }} From 30a996aefd3727b7f293a001ec992f9aafd92cf6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:40:22 -0700 Subject: [PATCH 279/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 9e984762c..464a5dc2f 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -77,7 +77,6 @@ jobs: echo "$NPMRC" | base64 --decode > ~/.npmrc env: NPMRC: ${{ secrets.NPMRC }} - - name: npm login run: | From 1ff8bc915319a7bf0fd0fe325e127f54b7cb8707 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:41:14 -0700 Subject: [PATCH 280/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 464a5dc2f..9e984762c 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -77,6 +77,7 @@ jobs: echo "$NPMRC" | base64 --decode > ~/.npmrc env: NPMRC: ${{ secrets.NPMRC }} + - name: npm login run: | From 5368a2ffd0b69ac247a178c069adb555d9524418 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:42:13 -0700 Subject: [PATCH 281/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 9e984762c..31a404eca 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -52,10 +52,10 @@ jobs: with: node-version: ${{ matrix.nodejs-tag[1] }} - - name: npm rc - run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc - env: - NPMRC_OFF: ${{ secrets.NPMRC_OFF }} + #- name: npm rc + # run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc + # env: + # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} #- name: npm login # run: | From f55614e24eae84ca1ff459563b29c16cfad6e840 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 10:57:05 -0700 Subject: [PATCH 282/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 31a404eca..973cc3b08 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -81,7 +81,8 @@ jobs: - name: npm login run: | - npm login + npm login + npm whoami - name: npm get registry From de764371a32ff48ade8e27387ed67afead8011bf Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 11:11:33 -0700 Subject: [PATCH 283/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 973cc3b08..f7d18eff9 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -78,13 +78,6 @@ jobs: env: NPMRC: ${{ secrets.NPMRC }} - - - name: npm login - run: | - npm login - npm whoami - - - name: npm get registry run: | npm get registry From bb1c5c1e9b1eb028a2e165a8c054de624f340b7e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 11:56:43 -0700 Subject: [PATCH 284/417] CI/CD enginerring --- .../workflows/upload-jfrog-build-to-npm.yml | 70 +++++++++++-------- package.json | 2 +- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f7d18eff9..82f42a96f 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -28,6 +28,8 @@ on: required: true NPMRC_OFF: required: true + NODE_AUTH_TOKEN: + required: true jobs: publish-jfrog-build-to-npm: @@ -52,6 +54,16 @@ jobs: with: node-version: ${{ matrix.nodejs-tag[1] }} + #- name: change package name + #- run: | + # sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + + - name: npm publish + run: | + npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + #- name: npm rc # run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc # env: @@ -61,36 +73,36 @@ jobs: # run: | # npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web - - name: npm get registry - run: | - npm get registry +# - name: npm get registry +# run: | +# npm get registry +# +# - name: build pack +# run: | +# cat package.json +# npm version 6.0.3-dev.4 --no-git-tag-version +# ./scripts/build-c-client.sh; +# npm install; +# +# - name: npm rc 2 +# run: | +# echo "$NPMRC" | base64 --decode > ~/.npmrc +# env: +# NPMRC: ${{ secrets.NPMRC }} +# +# - name: npm get registry +# run: | +# npm get registry +# npm -v +# +# - name: npm publish +# run: | +# npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ +# +# - name: npm install +# run: | +# npm install aerospike@6.0.3-dev.4 - - name: build pack - run: | - cat package.json - npm version 6.0.3-dev.4 --no-git-tag-version - ./scripts/build-c-client.sh; - npm install; - - - name: npm rc 2 - run: | - echo "$NPMRC" | base64 --decode > ~/.npmrc - env: - NPMRC: ${{ secrets.NPMRC }} - - - name: npm get registry - run: | - npm get registry - npm -v - - - name: npm publish - run: | - npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ - - - - name: npm install - run: | - npm install aerospike@6.0.3-dev.4 #- name: Download JFrog build # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} diff --git a/package.json b/package.json index 998fe47c4..867247755 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "aerospike", + "name": "test-1-2-3", "version": "6.0.1", "description": "Aerospike Client Library", "keywords": [ From 4d94bd3b5590ccf33a01c24de9ee8bdac686ae14 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 11:57:35 -0700 Subject: [PATCH 285/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 82f42a96f..f72e830ae 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -28,7 +28,7 @@ on: required: true NPMRC_OFF: required: true - NODE_AUTH_TOKEN: + NPM_TOKEN: required: true jobs: From bc6bba01d981f1360dcc30c84dd1ede323ad100c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 11:59:04 -0700 Subject: [PATCH 286/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f72e830ae..122d5b9f9 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -58,6 +58,13 @@ jobs: #- run: | # sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + - name: build pack + run: | + cat package.json + npm version 6.0.3-dev.4 --no-git-tag-version + ./scripts/build-c-client.sh; + npm install; + - name: npm publish run: | npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ From 66d23ded318b3e22af68f208d2a50ea695ca8347 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:03:02 -0700 Subject: [PATCH 287/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 122d5b9f9..80df0b976 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -65,6 +65,17 @@ jobs: ./scripts/build-c-client.sh; npm install; + - name: npm rc 2 + run: | + echo "$NPMRC" | base64 --decode > ~/.npmrc + env: + NPMRC: ${{ secrets.NPMRC }} + + - name: npm get registry + run: | + npm get registry + npm -v + - name: npm publish run: | npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ From 295e6f55e38b585accd2a37aef747d27df10bf93 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:18:27 -0700 Subject: [PATCH 288/417] CI/CD enginerring --- .../workflows/upload-jfrog-build-to-npm.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 80df0b976..08984bbbf 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -54,9 +54,9 @@ jobs: with: node-version: ${{ matrix.nodejs-tag[1] }} - #- name: change package name - #- run: | - # sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + - name: change package name + - run: | + sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - name: build pack run: | @@ -65,11 +65,11 @@ jobs: ./scripts/build-c-client.sh; npm install; - - name: npm rc 2 - run: | - echo "$NPMRC" | base64 --decode > ~/.npmrc - env: - NPMRC: ${{ secrets.NPMRC }} +# - name: npm rc 2 +# run: | +# echo "$NPMRC" | base64 --decode > ~/.npmrc +# env: +# NPMRC: ${{ secrets.NPMRC }} - name: npm get registry run: | @@ -78,7 +78,7 @@ jobs: - name: npm publish run: | - npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From 916819136a3e4db845f29646056759f541361e03 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:20:50 -0700 Subject: [PATCH 289/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 6 +++--- .github/workflows/build-bindings.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 353b4599a..6b5fc9d2f 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -86,10 +86,10 @@ jobs: matrix: platform-tag: [ "manylinux_x86_64", - #"manylinux_aarch64", - #"macosx_x86_64", + "manylinux_aarch64", + "macosx_x86_64", #"macosx_arm64", - #"win_amd64" + "win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index db79f81e4..2f00c0b9d 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -34,10 +34,10 @@ on: required: true options: - manylinux_x86_64 - #- manylinux_aarch64 - #- macosx_x86_64 + - manylinux_aarch64 + - macosx_x86_64 #- macosx_arm64 - #- win_amd64 + - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 08984bbbf..a65847db8 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -55,7 +55,7 @@ jobs: node-version: ${{ matrix.nodejs-tag[1] }} - name: change package name - - run: | + run: | sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - name: build pack From 24a537bde27c55ae417780d1fc07ff955ad69237 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:24:15 -0700 Subject: [PATCH 290/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index a65847db8..f7319e3cd 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -76,6 +76,11 @@ jobs: npm get registry npm -v + - name: npm rc + run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc + env: + NPMRC_OFF: ${{ secrets.NPMRC_OFF }} + - name: npm publish run: | npm publish From 91107a22588c534f775cb6041c3cb77a1b642749 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:25:16 -0700 Subject: [PATCH 291/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f7319e3cd..5f63dfce6 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -58,6 +58,12 @@ jobs: run: | sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + + - name: npm rc + run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc + env: + NPMRC_OFF: ${{ secrets.NPMRC_OFF }} + - name: build pack run: | cat package.json @@ -76,10 +82,6 @@ jobs: npm get registry npm -v - - name: npm rc - run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc - env: - NPMRC_OFF: ${{ secrets.NPMRC_OFF }} - name: npm publish run: | From cc986c753bd4d9f515bc027ea5fce2eb98af202d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:30:16 -0700 Subject: [PATCH 292/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 5f63dfce6..5063abb50 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -58,7 +58,6 @@ jobs: run: | sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - - name: npm rc run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc env: From c7030630a329ed2d47b852f155f72dd3d9f71014 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:30:53 -0700 Subject: [PATCH 293/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 5063abb50..5f63dfce6 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -58,6 +58,7 @@ jobs: run: | sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + - name: npm rc run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc env: From 7e4b98f6aa1a46f8f7f9e4336a42d25320c02cb2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:37:48 -0700 Subject: [PATCH 294/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 5f63dfce6..43845788b 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -28,7 +28,7 @@ on: required: true NPMRC_OFF: required: true - NPM_TOKEN: + NPM_TOKEN_OFF: required: true jobs: @@ -59,10 +59,10 @@ jobs: sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - - name: npm rc - run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc - env: - NPMRC_OFF: ${{ secrets.NPMRC_OFF }} + #- name: npm rc + # run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc + # env: + # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} - name: build pack run: | @@ -87,7 +87,7 @@ jobs: run: | npm publish env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} #- name: npm rc # run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc From 7a7f0002bd3ddcd39e0071d9a3f24b3d591733fb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:42:05 -0700 Subject: [PATCH 295/417] CI/CD enginerring --- .../workflows/upload-jfrog-build-to-npm.yml | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 43845788b..d50693b14 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -59,10 +59,6 @@ jobs: sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - #- name: npm rc - # run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc - # env: - # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} - name: build pack run: | @@ -71,11 +67,11 @@ jobs: ./scripts/build-c-client.sh; npm install; -# - name: npm rc 2 -# run: | -# echo "$NPMRC" | base64 --decode > ~/.npmrc -# env: -# NPMRC: ${{ secrets.NPMRC }} + - name: npm rc 2 + run: | + echo "$NPMRC" | base64 --decode > ~/.npmrc + env: + NPMRC: ${{ secrets.NPMRC }} - name: npm get registry run: | @@ -83,11 +79,21 @@ jobs: npm -v +# - name: npm rc +# run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc +# env: +# NPMRC_OFF: ${{ secrets.NPMRC_OFF }} + +# - name: npm publish +# run: | +# npm publish +# env: +# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} + - name: npm publish run: | - npm publish - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} + npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + #- name: npm rc # run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc From 678196b52d17b558f3006f8a36c6aeb559c56103 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:55:21 -0700 Subject: [PATCH 296/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 26 ++++++++-------- .github/workflows/npm-install-script-test.yml | 30 +++++++++++++++++-- .../workflows/upload-jfrog-build-to-npm.yml | 21 ++----------- .github/workflows/upload-to-jfrog.yml | 2 ++ 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index b7742c5ef..016755fd8 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,20 +25,20 @@ jobs: # uses: ./.github/workflows/release-package.yml # secrets: inherit -# rebuild-artifacts-with-new-dev-num: -# #needs: bump-dev-number -# name: Rebuild artifacts with new dev number -# uses: ./.github/workflows/build-artifacts.yml -# with: -# # On pull_request_target, the bump version commit will be ignored -# # So we must pass it manually to the workflow -# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} -# secrets: inherit + rebuild-artifacts-with-new-dev-num: + #needs: bump-dev-number + name: Rebuild artifacts with new dev number + uses: ./.github/workflows/build-artifacts.yml + with: + # On pull_request_target, the bump version commit will be ignored + # So we must pass it manually to the workflow + sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} + secrets: inherit -# test-npm-install: -# needs: rebuild-artifacts-with-new-dev-num -# name: Test npm install command for npm package -# uses: ./.github/workflows/npm-install-script-test.yml + test-npm-install: + needs: rebuild-artifacts-with-new-dev-num + name: Test npm install command for npm package + uses: ./.github/workflows/npm-install-script-test.yml # upload-to-jfrog: # name: Upload artifacts to JFrog diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 3c01db20e..9dc0db8d9 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -1,4 +1,4 @@ -name: npm install script test +Fname: npm install script test on: workflow_call: # This allows this workflow to be reused by others. @@ -159,7 +159,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.1-dev.1 --no-git-tag-version + run: npm version 6.0.3-dev.5 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -168,6 +168,32 @@ jobs: - name: run install command run: npm install + - name: List available artifacts + run: ls ./lib/binding || echo "No artifacts found in binding" + + - name: change package name + run: | + sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + + - name: npm rc 2 + run: | + echo "$NPMRC" | base64 --decode > ~/.npmrc + env: + NPMRC: ${{ secrets.NPMRC }} + + - name: npm get registry + run: | + npm get registry + npm -v + + - name: npm publish + run: | + npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + + - name: npm install + run: | + npm install aerospike@6.0.3-dev.5 + #- name: verdaccio server run # run: | # docker run --rm -d --name verdaccio -p 4873:4873 verdaccio/verdaccio diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index d50693b14..31173078b 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -57,8 +57,6 @@ jobs: - name: change package name run: | sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - - - name: build pack run: | @@ -67,16 +65,9 @@ jobs: ./scripts/build-c-client.sh; npm install; - - name: npm rc 2 - run: | - echo "$NPMRC" | base64 --decode > ~/.npmrc - env: - NPMRC: ${{ secrets.NPMRC }} - - - name: npm get registry + - name: modify install script run: | - npm get registry - npm -v + json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" # - name: npm rc @@ -90,9 +81,6 @@ jobs: # env: # NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} - - name: npm publish - run: | - npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ #- name: npm rc @@ -129,10 +117,7 @@ jobs: # - name: npm publish # run: | # npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ -# -# - name: npm install -# run: | -# npm install aerospike@6.0.3-dev.4 + #- name: Download JFrog build diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index e1ffea0cf..b8ef340ca 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -40,6 +40,8 @@ jobs: merge-multiple: true path: artifacts + - name: print artifacts + run: ls . - name: Set up JFrog credentials uses: jfrog/setup-jfrog-cli@v4 env: From f6e56440e7b57bac2f96217ad59e1542385860a5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:56:15 -0700 Subject: [PATCH 297/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 9dc0db8d9..7fea9a2b5 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -1,4 +1,4 @@ -Fname: npm install script test +name: npm install script test on: workflow_call: # This allows this workflow to be reused by others. From 31360ac2bc07a2a7ffd147f10e5d7951d226cdc8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 12:56:57 -0700 Subject: [PATCH 298/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 016755fd8..15327122f 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -51,17 +51,17 @@ jobs: # version: ${{ needs.bump-dev-number.outputs.new_version }} # #secrets: inherit - publish-to-npm: - name: Upload artifacts to JFrog +# publish-to-npm: +# name: Upload artifacts to JFrog #needs: [ # bump-dev-number, # rebuild-artifacts-with-new-dev-num, # upload-to-jfrog #] - uses: ./.github/workflows/upload-jfrog-build-to-npm.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit +# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: From 75b4338b9f2ecf390577d6d8483ca67f1642dd80 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 13:12:54 -0700 Subject: [PATCH 299/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 7fea9a2b5..435e69f1d 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -60,44 +60,44 @@ jobs: - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v108-linux-x64/ + path: ./lib/binding/glibc@2.35/node-v108-linux-x64/ - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v115-linux-x64/ + path: ./lib/binding/glibc@2.35/node-v115-linux-x64/ - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v127-linux-x64/ + path: ./lib/binding/glibc@2.35/node-v127-linux-x64/ - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ + path: ./lib/binding/glibc@2.35/node-v131-linux-x64/ ## Linux ARM - uses: actions/download-artifact@v4 with: name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v108-linux-arm64/ + path: ./lib/binding/glibc@2.35/node-v108-linux-arm64/ - uses: actions/download-artifact@v4 with: name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v115-linux-arm64/ + path: ./lib/binding/glibc@2.35/node-v115-linux-arm64/ - uses: actions/download-artifact@v4 with: name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v127-linux-arm64/ + path: ./lib/binding/glibc@2.35/node-v127-linux-arm64/ - uses: actions/download-artifact@v4 with: name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.31/node-v131-linux-arm64/ + path: ./lib/binding/glibc@2.35/node-v131-linux-arm64/ # Windows - uses: actions/download-artifact@v4 @@ -127,8 +127,8 @@ jobs: ls .; echo "BINDING FOLDER:"; ls ./lib/binding; - mkdir -p lib/binding/glibc@2.35/node-v108-darwin-x64 lib/binding/glibc@2.35/node-v115-darwin-x64 lib/binding/glibc@2.35/node-v127-darwin-x64 lib/binding/glibc@2.35/node-v131-darwin-x64; - mkdir -p lib/binding/glibc@2.35/node-v108-linux-x64 lib/binding/glibc@2.35/node-v115-linux-x64 lib/binding/glibc@2.35/node-v127-linux-x64 lib/binding/glibc@2.35/node-v131-linux-x64; + mkdir -p lib/binding/glibc@2.31/node-v108-darwin-x64 lib/binding/glibc@2.31/node-v115-darwin-x64 lib/binding/glibc@2.31/node-v127-darwin-x64 lib/binding/glibc@2.31/node-v131-darwin-x64; + mkdir -p lib/binding/glibc@2.31/node-v108-linux-x64 lib/binding/glibc@2.31/node-v115-linux-x64 lib/binding/glibc@2.31/node-v127-linux-x64 lib/binding/glibc@2.31/node-v131-linux-x64; # echo "BINDING FOLDER:"; # mkdir -p lib/binding/node-v108-darwin-arm64 lib/binding/node-v115-darwin-arm64 lib/binding/node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 # mkdir -p lib/binding/glibc@2.31/node-v108-linux-arm64 lib/binding/glibc@2.31/node-v115-linux-arm64 lib/binding/glibc@2.31/node-v127-linux-arm64 lib/binding/glibc@2.35/node-v131-linux-arm64 @@ -151,15 +151,16 @@ jobs: # cp -r node-v127-darwin-arm64 lib/binding/node-v131-darwin-arm64 - name: List available artifacts - run: ls ./lib/binding || echo "No artifacts found in binding" - + run: | + ls ./lib/binding || echo "No artifacts found in binding" + ls ./lib/binding/glibc - name: Set up Node.js uses: actions/setup-node@v3 with: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.5 --no-git-tag-version + run: npm version 6.0.3-dev.6 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -192,7 +193,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.5 + npm install aerospike@6.0.3-dev.6 #- name: verdaccio server run # run: | From 593b712609ba2f48da223b0df8785fdb009912b5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 13:23:59 -0700 Subject: [PATCH 300/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 435e69f1d..bb8d6032f 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -153,7 +153,7 @@ jobs: - name: List available artifacts run: | ls ./lib/binding || echo "No artifacts found in binding" - ls ./lib/binding/glibc + ls ./lib/binding/glibc@2.35 - name: Set up Node.js uses: actions/setup-node@v3 with: From 908e27e2a5dc9b08e357402da7a211f5a30fefc8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 13:37:23 -0700 Subject: [PATCH 301/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index bb8d6032f..d3eb8120a 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -2,7 +2,10 @@ name: npm install script test on: workflow_call: # This allows this workflow to be reused by others. - + secrets: + # Just make all the secrets required to make things simpler... + NPMRC: + required: true jobs: npm-install-script-test: runs-on: ubuntu-latest From f067df174b85d30f3ca43b76c4d436f004607d13 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 13:42:40 -0700 Subject: [PATCH 302/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 1 + .github/workflows/npm-install-script-test.yml | 5 +++- .../workflows/upload-jfrog-build-to-npm.yml | 26 ++++++++++++------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 15327122f..e597a4762 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -39,6 +39,7 @@ jobs: needs: rebuild-artifacts-with-new-dev-num name: Test npm install command for npm package uses: ./.github/workflows/npm-install-script-test.yml + secrets: inherit # upload-to-jfrog: # name: Upload artifacts to JFrog diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index d3eb8120a..2d2d07817 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -198,7 +198,10 @@ jobs: run: | npm install aerospike@6.0.3-dev.6 - #- name: verdaccio server run + - name: List available artifacts + run: | + ls ./lib/binding || echo "No artifacts found in binding" + # run: | # docker run --rm -d --name verdaccio -p 4873:4873 verdaccio/verdaccio # curl http://0.0.0.0:4873/ diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 31173078b..c86d0f25a 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -57,17 +57,23 @@ jobs: - name: change package name run: | sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - - - name: build pack - run: | - cat package.json - npm version 6.0.3-dev.4 --no-git-tag-version - ./scripts/build-c-client.sh; - npm install; - - name: modify install script - run: | - json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + - name: + run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" + env: + NEW_VERSION: 6.0.3-dev.7 + PACKAGE_MANAGER: npm + + #- name: build pack + # run: | + # cat package.json + # npm version 6.0.3-dev.7 --no-git-tag-version + + # npm install; + + #- name: modify install script + # run: | + # json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" # - name: npm rc From 65e5b7faeefa0d9d55e88c763c3c9d64b819e389 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 13:47:48 -0700 Subject: [PATCH 303/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 2 +- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 17 ++++++++--------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index e597a4762..a0ed69d37 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -39,7 +39,7 @@ jobs: needs: rebuild-artifacts-with-new-dev-num name: Test npm install command for npm package uses: ./.github/workflows/npm-install-script-test.yml - secrets: inherit + secrets: inherit # upload-to-jfrog: # name: Upload artifacts to JFrog diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 2d2d07817..27cc15e5d 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -163,7 +163,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.6 --no-git-tag-version + run: npm version 6.0.3-dev.7 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -196,7 +196,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.6 + npm install aerospike@6.0.3-dev.7 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index c86d0f25a..c477f2011 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -64,16 +64,15 @@ jobs: NEW_VERSION: 6.0.3-dev.7 PACKAGE_MANAGER: npm - #- name: build pack - # run: | - # cat package.json - # npm version 6.0.3-dev.7 --no-git-tag-version - - # npm install; + - name: build pack + run: | + ls downloaded-artifacts + npm version 6.0.3-dev.7 --no-git-tag-version + npm install; - #- name: modify install script - # run: | - # json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + - name: modify install script + run: | + json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" # - name: npm rc From 29c9cb8eb23f49b8f9226d078633bea20b5e89f9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 14:10:53 -0700 Subject: [PATCH 304/417] CI/CD enginerring --- .github/workflows/build-bindings.yml | 1 - .github/workflows/dev-workflow-p2.yml | 12 ++++++------ .github/workflows/npm-install-script-test.yml | 15 ++++++++------- .github/workflows/upload-jfrog-build-to-npm.yml | 4 ++-- .github/workflows/upload-to-jfrog.yml | 6 ++++-- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 2f00c0b9d..25ba62197 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -256,7 +256,6 @@ jobs: ./scripts/build-c-client.sh; npm install; - - name: Run tests if: ${{ inputs.run_tests && (inputs.platform-tag == 'manylinux_x86_64' || inputs.platform-tag == 'manylinux_aarch64') }} run: | diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index a0ed69d37..43f27d070 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -50,15 +50,15 @@ jobs: # uses: ./.github/workflows/upload-to-jfrog.yml # with: # version: ${{ needs.bump-dev-number.outputs.new_version }} -# #secrets: inherit +# secrets: inherit # publish-to-npm: # name: Upload artifacts to JFrog - #needs: [ - # bump-dev-number, - # rebuild-artifacts-with-new-dev-num, - # upload-to-jfrog - #] +# needs: [ +# # bump-dev-number, +# rebuild-artifacts-with-new-dev-num, +# upload-to-jfrog +# #] # uses: ./.github/workflows/upload-jfrog-build-to-npm.yml # with: # version: ${{ needs.bump-dev-number.outputs.new_version }} diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 27cc15e5d..78fd1bb16 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -157,13 +157,14 @@ jobs: run: | ls ./lib/binding || echo "No artifacts found in binding" ls ./lib/binding/glibc@2.35 + - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.7 --no-git-tag-version + run: npm version 6.0.3-dev.9 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -175,9 +176,9 @@ jobs: - name: List available artifacts run: ls ./lib/binding || echo "No artifacts found in binding" - - name: change package name - run: | - sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + #- name: change package name + # run: | + # sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - name: npm rc 2 run: | @@ -196,11 +197,11 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.7 + npm install aerospike@6.0.3-dev.9 - name: List available artifacts run: | - ls ./lib/binding || echo "No artifacts found in binding" + node -e "console.log(require('aerospike').batchType)" # run: | # docker run --rm -d --name verdaccio -p 4873:4873 verdaccio/verdaccio diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index c477f2011..626ec363f 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -61,13 +61,13 @@ jobs: - name: run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.7 + NEW_VERSION: 6.0.3-dev.9 PACKAGE_MANAGER: npm - name: build pack run: | ls downloaded-artifacts - npm version 6.0.3-dev.7 --no-git-tag-version + npm version 6.0.3-dev.9 --no-git-tag-version npm install; - name: modify install script diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index b8ef340ca..829833c56 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -42,6 +42,7 @@ jobs: - name: print artifacts run: ls . + - name: Set up JFrog credentials uses: jfrog/setup-jfrog-cli@v4 env: @@ -64,9 +65,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.4 + NEW_VERSION: 6.0.3-dev.9 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.4 \ No newline at end of file + run: jf rt build-publish nodejs-client 6.0.3-dev.9 + From f40f72b717299ac11f14df9b3436a85e69b3a0a1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 14:22:17 -0700 Subject: [PATCH 305/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 42 +++++++++---------- .github/workflows/npm-install-script-test.yml | 6 +-- .../workflows/upload-jfrog-build-to-npm.yml | 14 ++++--- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 43f27d070..10acbf957 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -41,28 +41,28 @@ jobs: uses: ./.github/workflows/npm-install-script-test.yml secrets: inherit -# upload-to-jfrog: -# name: Upload artifacts to JFrog -# needs: [ -# # bump-dev-number, -# rebuild-artifacts-with-new-dev-num -# ] -# uses: ./.github/workflows/upload-to-jfrog.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit + upload-to-jfrog: + name: Upload artifacts to JFrog + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num + ] + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit -# publish-to-npm: -# name: Upload artifacts to JFrog -# needs: [ -# # bump-dev-number, -# rebuild-artifacts-with-new-dev-num, -# upload-to-jfrog -# #] -# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit + publish-to-npm: + name: Upload artifacts to JFrog + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num, + upload-to-jfrog + #] + uses: ./.github/workflows/upload-jfrog-build-to-npm.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 78fd1bb16..b8051252e 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -176,9 +176,9 @@ jobs: - name: List available artifacts run: ls ./lib/binding || echo "No artifacts found in binding" - #- name: change package name - # run: | - # sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + - name: change package name + run: | + sed -i 's/"name": "[^"]*"/"name": "aerospike"/' package.json - name: npm rc 2 run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 626ec363f..e8824a01c 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -80,11 +80,15 @@ jobs: # env: # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} -# - name: npm publish -# run: | -# npm publish -# env: -# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} + - name: Change install command for release + run: node ./scripts/change-install-command.js + + + - name: npm publish + run: | + npm publish + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} From ce22f4f1cd5da6f04f440f19fe942c0729d29078 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 14:25:40 -0700 Subject: [PATCH 306/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 10acbf957..404f024b1 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -58,7 +58,7 @@ jobs: # bump-dev-number, rebuild-artifacts-with-new-dev-num, upload-to-jfrog - #] + ] uses: ./.github/workflows/upload-jfrog-build-to-npm.yml with: version: ${{ needs.bump-dev-number.outputs.new_version }} From 77320dcd81911d7cd1c798e4819b551e43d90241 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 14:26:32 -0700 Subject: [PATCH 307/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 4 ++-- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index b8051252e..aa883d077 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -164,7 +164,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.9 --no-git-tag-version + run: npm version 6.0.3-dev.10 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -197,7 +197,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.9 + npm install aerospike@6.0.3-dev.10 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index e8824a01c..1d2ec1334 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -61,13 +61,13 @@ jobs: - name: run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.9 + NEW_VERSION: 6.0.3-dev.10 PACKAGE_MANAGER: npm - name: build pack run: | ls downloaded-artifacts - npm version 6.0.3-dev.9 --no-git-tag-version + npm version 6.0.3-dev.10 --no-git-tag-version npm install; - name: modify install script diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 829833c56..30e23309c 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -65,10 +65,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.9 + NEW_VERSION: 6.0.3-dev.10 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.9 + run: jf rt build-publish nodejs-client 6.0.3-dev.10 From 4fe41d805206dddb4ae86b7aefb8ecb0174e348f Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 14:50:34 -0700 Subject: [PATCH 308/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 +- .../workflows/upload-jfrog-build-to-npm.yml | 66 +++---------------- .github/workflows/upload-to-jfrog.yml | 6 +- 3 files changed, 15 insertions(+), 61 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index aa883d077..10f3c452e 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -164,7 +164,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.10 --no-git-tag-version + run: npm version 6.0.3-dev.11 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -197,7 +197,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.10 + npm install aerospike@6.0.3-dev.11 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 1d2ec1334..b74350092 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -58,16 +58,22 @@ jobs: run: | sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json - - name: + - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.10 + NEW_VERSION: 6.0.3-dev.11 PACKAGE_MANAGER: npm - - name: build pack + - name: list Artifacts run: | ls downloaded-artifacts - npm version 6.0.3-dev.10 --no-git-tag-version + + - name: change verison + run: | + npm version 6.0.3-dev.11 --no-git-tag-version + + - name: install package + run: | npm install; - name: modify install script @@ -80,64 +86,12 @@ jobs: # env: # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} - - name: Change install command for release - run: node ./scripts/change-install-command.js - - - name: npm publish run: | npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} - - - #- name: npm rc - # run: echo "$NPMRC_OFF" | base64 --decode > ~/.npmrc - # env: - # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} - - #- name: npm login - # run: | - # npm login --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ --auth-type=web - -# - name: npm get registry -# run: | -# npm get registry -# -# - name: build pack -# run: | -# cat package.json -# npm version 6.0.3-dev.4 --no-git-tag-version -# ./scripts/build-c-client.sh; -# npm install; -# -# - name: npm rc 2 -# run: | -# echo "$NPMRC" | base64 --decode > ~/.npmrc -# env: -# NPMRC: ${{ secrets.NPMRC }} -# -# - name: npm get registry -# run: | -# npm get registry -# npm -v -# -# - name: npm publish -# run: | -# npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ - - - - #- name: Download JFrog build - # run: jf rt dl --build python-client/6.0.3-dev.1 ${{ vars.JFROG_REPO_NAME }} - #- name: npm install from JFrog - # run: | - # jf npm-config --repo-deploy --repo-resolve clients-npm-dev-local - # jf npm install --build-name=nodejs-client --build-number=6.0.3-dev.4 - # ls . - - #- run: npm ci #- run: npm publish --provenance --access public # env: diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 30e23309c..fdd0954f1 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -41,7 +41,7 @@ jobs: path: artifacts - name: print artifacts - run: ls . + run: ls artifacts - name: Set up JFrog credentials uses: jfrog/setup-jfrog-cli@v4 @@ -65,10 +65,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.10 + NEW_VERSION: 6.0.3-dev.11 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.10 + run: jf rt build-publish nodejs-client 6.0.3-dev.11 From 10e1ad14da41a08eed46143f98c377c33d108306 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 17 Jan 2025 15:00:03 -0700 Subject: [PATCH 309/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 5 +++-- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 10f3c452e..1294d24b1 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -164,7 +164,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.11 --no-git-tag-version + run: npm version 6.0.3-dev.12 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -197,7 +197,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.11 + npm install aerospike@6.0.3-dev.12 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index b74350092..5de25717a 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -61,7 +61,7 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.11 + NEW_VERSION: 6.0.3-dev.12 PACKAGE_MANAGER: npm - name: list Artifacts @@ -70,10 +70,11 @@ jobs: - name: change verison run: | - npm version 6.0.3-dev.11 --no-git-tag-version + npm version 6.0.3-dev.12 --no-git-tag-version - name: install package run: | + ./scripts/build-c-client.sh; npm install; - name: modify install script diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index fdd0954f1..608235883 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -65,10 +65,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.11 + NEW_VERSION: 6.0.3-dev.12 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.11 + run: jf rt build-publish nodejs-client 6.0.3-dev.12 From 353e91c3462fce8505ba1add4edc44bf4b8d8583 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 14:59:17 -0700 Subject: [PATCH 310/417] CI/CD enginerring --- .../download-github-artifacts/action.yml | 112 ++++++++++++++++++ .github/workflows/npm-install-script-test.yml | 108 +---------------- 2 files changed, 114 insertions(+), 106 deletions(-) create mode 100644 .github/actions/download-github-artifacts/action.yml diff --git a/.github/actions/download-github-artifacts/action.yml b/.github/actions/download-github-artifacts/action.yml new file mode 100644 index 000000000..144de7967 --- /dev/null +++ b/.github/actions/download-github-artifacts/action.yml @@ -0,0 +1,112 @@ +name: 'Donwload github artifacts' +description: 'Update version in repo without committing. Repo must already be checked out' + +runs: + using: "composite" + steps: + # MAC X86 + - uses: actions/download-artifact@v4 + with: + name: v108-macosx_x86_64.node + path: ./lib/binding/node-v108-darwin-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-macosx_x86_64.node + path: ./lib/binding/node-v115-darwin-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v127-macosx_x86_64.node + path: ./lib/binding/node-v127-darwin-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-macosx_x86_64.node + path: ./lib/binding/node-v131-darwin-x64/ + + # MAC ARM + #- uses: actions/download-artifact@v4 + # with: + # name: v108-macosx_x86_64.node + # path: ./lib/binding/node-v108-darwin-arm64/ + + #- uses: actions/download-artifact@v4 + # with: + # name: v115-macosx_x86_64.node + # path: ./lib/binding/node-v115-darwin-arm64/ + + #- uses: actions/download-artifact@v4 + # with: + # name: v127-macosx_x86_64.node + # path: ./lib/binding/node-v127-darwin-arm64/ + + #- uses: actions/download-artifact@v4 + # with: + # name: v131-macosx_x86_64.node + # path: ./lib/binding/node-v131-darwin-arm64/ + + # Linux X86 + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v108-linux-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v115-linux-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v127-linux-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v131-linux-x64/ + + ## Linux ARM + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v108-linux-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v115-linux-arm64/ + + + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v127-linux-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_x86_64.node + path: ./lib/binding/glibc@2.35/node-v131-linux-arm64/ + + # Windows + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_x86_64.node + path: ./lib/binding/node-v108-win32-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_x86_64.node + path: ./lib/binding/node-v115-win32-x64/ + + + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_x86_64.node + path: ./lib/binding/node-v127-win32-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_x86_64.node + path: ./lib/binding/node-v131-win32-x64/ \ No newline at end of file diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 1294d24b1..5094fb61a 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -17,112 +17,8 @@ jobs: - name: Create multiple directories run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ - # MAC X86 - - uses: actions/download-artifact@v4 - with: - name: v108-macosx_x86_64.node - path: ./lib/binding/node-v108-darwin-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v115-macosx_x86_64.node - path: ./lib/binding/node-v115-darwin-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v127-macosx_x86_64.node - path: ./lib/binding/node-v127-darwin-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v131-macosx_x86_64.node - path: ./lib/binding/node-v131-darwin-x64/ - - # MAC ARM - #- uses: actions/download-artifact@v4 - # with: - # name: v108-macosx_x86_64.node - # path: ./lib/binding/node-v108-darwin-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v115-macosx_x86_64.node - # path: ./lib/binding/node-v115-darwin-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v127-macosx_x86_64.node - # path: ./lib/binding/node-v127-darwin-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v131-macosx_x86_64.node - # path: ./lib/binding/node-v131-darwin-arm64/ - - # Linux X86 - - uses: actions/download-artifact@v4 - with: - name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v108-linux-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v115-linux-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v127-linux-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v131-linux-x64/ - - ## Linux ARM - - uses: actions/download-artifact@v4 - with: - name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v108-linux-arm64/ - - - uses: actions/download-artifact@v4 - with: - name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v115-linux-arm64/ - - - - uses: actions/download-artifact@v4 - with: - name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v127-linux-arm64/ - - - uses: actions/download-artifact@v4 - with: - name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v131-linux-arm64/ - - # Windows - - uses: actions/download-artifact@v4 - with: - name: v108-manylinux_x86_64.node - path: ./lib/binding/node-v108-win32-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v115-manylinux_x86_64.node - path: ./lib/binding/node-v115-win32-x64/ - - - - uses: actions/download-artifact@v4 - with: - name: v127-manylinux_x86_64.node - path: ./lib/binding/node-v127-win32-x64/ - - - uses: actions/download-artifact@v4 - with: - name: v131-manylinux_x86_64.node - path: ./lib/binding/node-v131-win32-x64/ + - name: Download Artifacts + uses: ./github/actions/download-github/artifacts - name: Install client shell: bash From df44702136267ec1ed81196b3d7bdfdf4bbe4bc1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 17:39:30 -0700 Subject: [PATCH 311/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 6b5fc9d2f..54e9cda35 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -86,7 +86,7 @@ jobs: matrix: platform-tag: [ "manylinux_x86_64", - "manylinux_aarch64", + #"manylinux_aarch64", "macosx_x86_64", #"macosx_arm64", "win_amd64" From c7ec035a9bc89a99be87e017877b9695191decdb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 17:50:36 -0700 Subject: [PATCH 312/417] CI/CD enginerring --- .../download-github-artifacts/action.yml | 66 +++++++++---------- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/build-bindings.yml | 2 +- .github/workflows/npm-install-script-test.yml | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/actions/download-github-artifacts/action.yml b/.github/actions/download-github-artifacts/action.yml index 144de7967..adaf029d0 100644 --- a/.github/actions/download-github-artifacts/action.yml +++ b/.github/actions/download-github-artifacts/action.yml @@ -1,5 +1,5 @@ name: 'Donwload github artifacts' -description: 'Update version in repo without committing. Repo must already be checked out' +description: 'Download github artifacts for all supported versions' runs: using: "composite" @@ -68,45 +68,45 @@ runs: path: ./lib/binding/glibc@2.35/node-v131-linux-x64/ ## Linux ARM - - uses: actions/download-artifact@v4 - with: - name: v108-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v108-linux-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v108-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.35/node-v108-linux-arm64/ - - uses: actions/download-artifact@v4 - with: - name: v115-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v115-linux-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v115-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.35/node-v115-linux-arm64/ - - uses: actions/download-artifact@v4 - with: - name: v127-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v127-linux-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v127-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.35/node-v127-linux-arm64/ - - uses: actions/download-artifact@v4 - with: - name: v131-manylinux_x86_64.node - path: ./lib/binding/glibc@2.35/node-v131-linux-arm64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v131-manylinux_x86_64.node + # path: ./lib/binding/glibc@2.35/node-v131-linux-arm64/ # Windows - - uses: actions/download-artifact@v4 - with: - name: v108-manylinux_x86_64.node - path: ./lib/binding/node-v108-win32-x64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v108-manylinux_x86_64.node + # path: ./lib/binding/node-v108-win32-x64/ - - uses: actions/download-artifact@v4 - with: - name: v115-manylinux_x86_64.node - path: ./lib/binding/node-v115-win32-x64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v115-manylinux_x86_64.node + # path: ./lib/binding/node-v115-win32-x64/ - - uses: actions/download-artifact@v4 - with: - name: v127-manylinux_x86_64.node - path: ./lib/binding/node-v127-win32-x64/ + #- uses: actions/download-artifact@v4 + # with: + # name: v127-manylinux_x86_64.node + # path: ./lib/binding/node-v127-win32-x64/ - - uses: actions/download-artifact@v4 - with: - name: v131-manylinux_x86_64.node - path: ./lib/binding/node-v131-win32-x64/ \ No newline at end of file + #- uses: actions/download-artifact@v4 + # with: + # name: v131-manylinux_x86_64.node + # path: ./lib/binding/node-v131-win32-x64/ \ No newline at end of file diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 54e9cda35..6b5fc9d2f 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -86,7 +86,7 @@ jobs: matrix: platform-tag: [ "manylinux_x86_64", - #"manylinux_aarch64", + "manylinux_aarch64", "macosx_x86_64", #"macosx_arm64", "win_amd64" diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 25ba62197..aeb675fe3 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -37,7 +37,7 @@ on: - manylinux_aarch64 - macosx_x86_64 #- macosx_arm64 - - win_amd64 + #- win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 5094fb61a..271e99a4a 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -18,7 +18,7 @@ jobs: run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ - name: Download Artifacts - uses: ./github/actions/download-github/artifacts + uses: ./github/actions/download-github-artifacts - name: Install client shell: bash From 96bc021a070fefd6e81b09f8e14f952c7d9ee40e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 17:55:35 -0700 Subject: [PATCH 313/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 4 ++-- .github/workflows/build-bindings.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 6b5fc9d2f..e306fc296 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -86,10 +86,10 @@ jobs: matrix: platform-tag: [ "manylinux_x86_64", - "manylinux_aarch64", + #"manylinux_aarch64", "macosx_x86_64", #"macosx_arm64", - "win_amd64" + #"win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index aeb675fe3..eeae44347 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -34,7 +34,7 @@ on: required: true options: - manylinux_x86_64 - - manylinux_aarch64 + #- manylinux_aarch64 - macosx_x86_64 #- macosx_arm64 #- win_amd64 From bcad7936dbfb1d95a1750973adc0106d8a3f3151 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 18:01:11 -0700 Subject: [PATCH 314/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 2 +- .github/workflows/npm-install-script-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index e306fc296..353b4599a 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -87,7 +87,7 @@ jobs: platform-tag: [ "manylinux_x86_64", #"manylinux_aarch64", - "macosx_x86_64", + #"macosx_x86_64", #"macosx_arm64", #"win_amd64" ] diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 271e99a4a..26faa1612 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -18,7 +18,7 @@ jobs: run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ - name: Download Artifacts - uses: ./github/actions/download-github-artifacts + uses: ./github/actions/download-github-artifacts/ - name: Install client shell: bash From a3f3835244953030c98f93fdc293b0de89ab65dc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 18:02:56 -0700 Subject: [PATCH 315/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 353b4599a..e306fc296 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -87,7 +87,7 @@ jobs: platform-tag: [ "manylinux_x86_64", #"manylinux_aarch64", - #"macosx_x86_64", + "macosx_x86_64", #"macosx_arm64", #"win_amd64" ] From d11d5d93681a0057eaae221fd4ae58dd6fe7aad8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 18:05:57 -0700 Subject: [PATCH 316/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 26faa1612..69e5e2bbb 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -18,7 +18,7 @@ jobs: run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ - name: Download Artifacts - uses: ./github/actions/download-github-artifacts/ + uses: .github/actions/download-github-artifacts/ - name: Install client shell: bash From ec9d34d99b0f2e8ddef6705b41f336897a1d3dcd Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 18:18:46 -0700 Subject: [PATCH 317/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 69e5e2bbb..6c6dcb318 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -18,7 +18,7 @@ jobs: run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ - name: Download Artifacts - uses: .github/actions/download-github-artifacts/ + uses: ./.github/actions/download-github-artifacts/ - name: Install client shell: bash From 23fba1d4519e6126971532b36791f23a6d361003 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 18:46:34 -0700 Subject: [PATCH 318/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 608235883..8a0d16916 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -33,15 +33,13 @@ jobs: name: Upload artifacts to JFrog runs-on: ubuntu-22.04 steps: - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - pattern: '*.node' - merge-multiple: true - path: artifacts + + - name: Download Artifacts + uses: ./.github/actions/download-github-artifacts/ + - name: print artifacts - run: ls artifacts + run: ls ./lib/binding - name: Set up JFrog credentials uses: jfrog/setup-jfrog-cli@v4 From 1174fc3a02c0f03110ce0ea5899af2b86ad4d6d8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 19:28:49 -0700 Subject: [PATCH 319/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 8a0d16916..258fe0f84 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -33,6 +33,12 @@ jobs: name: Upload artifacts to JFrog runs-on: ubuntu-22.04 steps: + + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Create multiple directories + run: mkdir -p ./lib/binding ./lib/binding/glibc@2.35/ ./lib/binding/glibc@2.31/ - name: Download Artifacts uses: ./.github/actions/download-github-artifacts/ From ca1e44874019d23fe974b9bfa68dcd098bd77edd Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 19:59:18 -0700 Subject: [PATCH 320/417] CI/CD enginerring --- .github/workflows/upload-to-jfrog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 258fe0f84..1aa1374c3 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -33,7 +33,7 @@ jobs: name: Upload artifacts to JFrog runs-on: ubuntu-22.04 steps: - + - name: Checkout repository uses: actions/checkout@v4 @@ -67,7 +67,7 @@ jobs: if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} # Source path must be in quotes if it contains an asterisk # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 - run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "artifacts/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ + run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: NEW_VERSION: 6.0.3-dev.12 PACKAGE_MANAGER: npm From edf5cabfc69a9c55a4bfd4791ecdd38381ce975b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 21:32:01 -0700 Subject: [PATCH 321/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 9 ++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 6c6dcb318..d873fb074 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -60,7 +60,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.12 --no-git-tag-version + run: npm version 6.0.3-dev.13 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -93,7 +93,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.12 + npm install aerospike@6.0.3-dev.13 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 5de25717a..0bbedd8b2 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -61,7 +61,7 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.12 + NEW_VERSION: 6.0.3-dev.13 PACKAGE_MANAGER: npm - name: list Artifacts @@ -70,16 +70,15 @@ jobs: - name: change verison run: | - npm version 6.0.3-dev.12 --no-git-tag-version + npm version 6.0.3-dev.13 --no-git-tag-version - name: install package run: | ./scripts/build-c-client.sh; npm install; - - name: modify install script - run: | - json -I -f package.json -e "this.scripts.install=\"npm-run-all removeExtraBinaries build\"" + - name: Change install command for release + run: node ./scripts/change-install-command.js # - name: npm rc diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 1aa1374c3..f207f2b43 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.12 + NEW_VERSION: 6.0.3-dev.13 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.12 + run: jf rt build-publish nodejs-client 6.0.3-dev.13 From 741811425ccb5249db82003437eb165a8a820932 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 21:47:59 -0700 Subject: [PATCH 322/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 0bbedd8b2..8a35dcf84 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -66,7 +66,8 @@ jobs: - name: list Artifacts run: | - ls downloaded-artifacts + ls downloaded-artifacts/aerospike + ls downloaded-artifacts/aerospike/lib/binding - name: change verison run: | From 03a7c5aa183f085d28207413b3161c0cee0540fd Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 22:12:37 -0700 Subject: [PATCH 323/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 13 +++++++++---- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index d873fb074..4ab57fac7 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -60,7 +60,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.13 --no-git-tag-version + run: npm version 6.0.3-dev.14 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -93,7 +93,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.13 + npm install aerospike@6.0.3-dev.14 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 8a35dcf84..71f0cd33a 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -3,6 +3,7 @@ name: Publish JFrog build to PyPI permissions: # This is required for requesting the OIDC token id-token: write + contents: read on: workflow_dispatch: @@ -53,6 +54,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: ${{ matrix.nodejs-tag[1] }} + registry-url: 'https://registry.npmjs.org' - name: change package name run: | @@ -61,17 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.13 + NEW_VERSION: 6.0.3-dev.14 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike - ls downloaded-artifacts/aerospike/lib/binding + ls downloaded-artifacts/aerospike/6.0.3-dev.14/lib/binding/ + + - name: Move artifacts + run: | + cp -r downloaded-artifacts/aerospike/6.0.3-dev.14/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.13 --no-git-tag-version + npm version 6.0.3-dev.14 --no-git-tag-version - name: install package run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index f207f2b43..56c28fb26 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.13 + NEW_VERSION: 6.0.3-dev.14 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.13 + run: jf rt build-publish nodejs-client 6.0.3-dev.14 From 173160f2db3595cf7cabfc3612bd682486597970 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 22:23:41 -0700 Subject: [PATCH 324/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- package.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 4ab57fac7..a0d2a6308 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -60,7 +60,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.14 --no-git-tag-version + run: npm version 6.0.3-dev.15 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -93,7 +93,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.14 + npm install aerospike@6.0.3-dev.15 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 71f0cd33a..b2bdd01fb 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -58,25 +58,25 @@ jobs: - name: change package name run: | - sed -i 's/"name": "[^"]*"/"name": "test-1-2-3"/' package.json + sed -i 's/"name": "[^"]*"/"name": "@dpeliniaerospike/xyzparbart"/' package.json - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.14 + NEW_VERSION: 6.0.3-dev.15 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.14/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.15/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.14/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.15/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.14 --no-git-tag-version + npm version 6.0.3-dev.15 --no-git-tag-version - name: install package run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 56c28fb26..a1395fe7d 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.14 + NEW_VERSION: 6.0.3-dev.15 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.14 + run: jf rt build-publish nodejs-client 6.0.3-dev.15 diff --git a/package.json b/package.json index 867247755..998fe47c4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "test-1-2-3", + "name": "aerospike", "version": "6.0.1", "description": "Aerospike Client Library", "keywords": [ From f483d6903745b98c4300e981f9232a92a93bf314 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 22:31:19 -0700 Subject: [PATCH 325/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index a0d2a6308..3c118bc54 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -60,7 +60,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.15 --no-git-tag-version + run: npm version 6.0.3-dev.16 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -93,7 +93,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.15 + npm install aerospike@6.0.3-dev.16 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index b2bdd01fb..b12cd1172 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -58,25 +58,25 @@ jobs: - name: change package name run: | - sed -i 's/"name": "[^"]*"/"name": "@dpeliniaerospike/xyzparbart"/' package.json + sed -i 's/"name": "[^"]*"/"name": "xyzparbart"/' package.json - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.15 + NEW_VERSION: 6.0.3-dev.16 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.15/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.16/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.15/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.16/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.15 --no-git-tag-version + npm version 6.0.3-dev.16 --no-git-tag-version - name: install package run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index a1395fe7d..98eee9434 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.15 + NEW_VERSION: 6.0.3-dev.16 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.15 + run: jf rt build-publish nodejs-client 6.0.3-dev.16 From 56566e5b30de1589580dbad5dae404c9e25954ff Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 22:46:00 -0700 Subject: [PATCH 326/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 15 +++++++++------ .github/workflows/upload-jfrog-build-to-npm.yml | 8 ++++---- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 3c118bc54..7300c739e 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -60,7 +60,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.16 --no-git-tag-version + run: npm version 6.0.3-dev.17 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -86,14 +86,17 @@ jobs: run: | npm get registry npm -v - - - name: npm publish - run: | - npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + + - name: Publish NPM package + run: jf rt npmp --repo=clients-npm-dev-local + + #- name: npm publish + # run: | + # npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ - name: npm install run: | - npm install aerospike@6.0.3-dev.16 + npm install aerospike@6.0.3-dev.17 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index b12cd1172..db0655f08 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.16 + NEW_VERSION: 6.0.3-dev.17 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.16/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.17/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.16/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.17/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.16 --no-git-tag-version + npm version 6.0.3-dev.17 --no-git-tag-version - name: install package run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 98eee9434..a67d88bc7 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.16 + NEW_VERSION: 6.0.3-dev.17 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.16 + run: jf rt build-publish nodejs-client 6.0.3-dev.17 From 5c9672a5c457f64d975ed3c7e27481272777c8e3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 22:53:27 -0700 Subject: [PATCH 327/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 17 ++++++++++++++--- .github/workflows/upload-jfrog-build-to-npm.yml | 8 ++++---- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 7300c739e..59b77f303 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -1,5 +1,8 @@ name: npm install script test - +permissions: + # This is required for requesting the OIDC token + id-token: write + on: workflow_call: # This allows this workflow to be reused by others. secrets: @@ -20,6 +23,14 @@ jobs: - name: Download Artifacts uses: ./.github/actions/download-github-artifacts/ + - name: Set up JFrog credentials + uses: jfrog/setup-jfrog-cli@v4 + env: + JF_URL: https://aerospike.jfrog.io + with: + oidc-provider-name: gh-aerospike-clients + oidc-audience: aerospike/clients + - name: Install client shell: bash run: | @@ -60,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.17 --no-git-tag-version + run: npm version 6.0.3-dev.18 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -96,7 +107,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.17 + npm install aerospike@6.0.3-dev.18 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index db0655f08..2be3e0261 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.17 + NEW_VERSION: 6.0.3-dev.18 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.17/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.18/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.17/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.18/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.17 --no-git-tag-version + npm version 6.0.3-dev.18 --no-git-tag-version - name: install package run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index a67d88bc7..8c11982e6 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.17 + NEW_VERSION: 6.0.3-dev.18 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.17 + run: jf rt build-publish nodejs-client 6.0.3-dev.18 From 9c726c02857daa158899e3bcec2b0915881b9080 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 23:02:11 -0700 Subject: [PATCH 328/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 59b77f303..cb64ff5af 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -2,7 +2,7 @@ name: npm install script test permissions: # This is required for requesting the OIDC token id-token: write - + on: workflow_call: # This allows this workflow to be reused by others. secrets: @@ -99,7 +99,7 @@ jobs: npm -v - name: Publish NPM package - run: jf rt npmp --repo=clients-npm-dev-local + run: jf rt npm-publish clients-npm-dev-local #- name: npm publish # run: | From 49cadff180adff90adaba6388b02c9347f28b0d2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 23:08:50 -0700 Subject: [PATCH 329/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index cb64ff5af..c93fc9375 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -99,7 +99,7 @@ jobs: npm -v - name: Publish NPM package - run: jf rt npm-publish clients-npm-dev-local + run: jf rt npm publish clients-npm-dev-local #- name: npm publish # run: | From 525195463c1cc4f3c26be38718d4277a89156179 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 23:09:49 -0700 Subject: [PATCH 330/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index c93fc9375..ab8a4ff37 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -99,7 +99,7 @@ jobs: npm -v - name: Publish NPM package - run: jf rt npm publish clients-npm-dev-local + run: jf rt npm publish #- name: npm publish # run: | From ef20cee2a8e6d029cc6acf9f71b4a71e60917a37 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 23:18:56 -0700 Subject: [PATCH 331/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index ab8a4ff37..67ae78dc9 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -99,7 +99,7 @@ jobs: npm -v - name: Publish NPM package - run: jf rt npm publish + run: jf npm publish clients-npm-dev-local #- name: npm publish # run: | From 81fabc0dbccc444fb43bc0e0424a03af280847f6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Wed, 22 Jan 2025 23:29:12 -0700 Subject: [PATCH 332/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 67ae78dc9..3b0298396 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -98,6 +98,9 @@ jobs: npm get registry npm -v + - name: Setup config + run: jf npm config + - name: Publish NPM package run: jf npm publish clients-npm-dev-local From 69bce276368c7da49743e01bc4f59cb1046bfe9b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 00:08:17 -0700 Subject: [PATCH 333/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 3b0298396..e84e963b7 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -99,7 +99,7 @@ jobs: npm -v - name: Setup config - run: jf npm config + run: jf npm-config - name: Publish NPM package run: jf npm publish clients-npm-dev-local From aba8470c4d200dcc453118d0d8a095cb56822cd6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 00:16:24 -0700 Subject: [PATCH 334/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index e84e963b7..f9e05f5bc 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -99,7 +99,7 @@ jobs: npm -v - name: Setup config - run: jf npm-config + run: jf npm-config --repo clients-npm-dev-local - name: Publish NPM package run: jf npm publish clients-npm-dev-local From c767406c4e4d1625ff177972bc2a7fcf7acb332c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 01:04:40 -0700 Subject: [PATCH 335/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index f9e05f5bc..044ba3414 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -85,7 +85,7 @@ jobs: - name: change package name run: | - sed -i 's/"name": "[^"]*"/"name": "aerospike"/' package.json + sed -i 's/"name": "[^"]*"/"name": "tarolike"/' package.json - name: npm rc 2 run: | @@ -99,10 +99,10 @@ jobs: npm -v - name: Setup config - run: jf npm-config --repo clients-npm-dev-local + run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve https://registry.npmjs.org/ - name: Publish NPM package - run: jf npm publish clients-npm-dev-local + run: jf npm publish #- name: npm publish # run: | From 9a6efc96be51627587cecbcf1029cba244f5cbac Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 01:52:18 -0700 Subject: [PATCH 336/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-jfrog-build-to-npm.yml | 11 +++++++---- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 044ba3414..03d0083ad 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.18 --no-git-tag-version + run: npm version 6.0.3-dev.19 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -110,7 +110,7 @@ jobs: - name: npm install run: | - npm install aerospike@6.0.3-dev.18 + npm install tarolike@6.0.3-dev.19 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 2be3e0261..ab52d5019 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.18 + NEW_VERSION: 6.0.3-dev.19 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.18/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.19/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.18/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.19/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.18 --no-git-tag-version + npm version 6.0.3-dev.19 --no-git-tag-version - name: install package run: | @@ -98,6 +98,9 @@ jobs: env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_OFF }} + - name: npm install + run: | + npm install xyzparbart #- run: npm ci #- run: npm publish --provenance --access public # env: diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 8c11982e6..c3a805f32 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.18 + NEW_VERSION: 6.0.3-dev.19 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.18 + run: jf rt build-publish nodejs-client 6.0.3-dev.19 From d4c82f335df5a556cb25e5ba4fe8bef0e7c9cad5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 02:14:56 -0700 Subject: [PATCH 337/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 3 +++ .github/workflows/upload-jfrog-build-to-npm.yml | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 03d0083ad..c774b83ff 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -108,6 +108,9 @@ jobs: # run: | # npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ + - name: npmrc + run: cat ~/.npmrc + - name: npm install run: | npm install tarolike@6.0.3-dev.19 diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index ab52d5019..40bdb88e3 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -78,11 +78,6 @@ jobs: run: | npm version 6.0.3-dev.19 --no-git-tag-version - - name: install package - run: | - ./scripts/build-c-client.sh; - npm install; - - name: Change install command for release run: node ./scripts/change-install-command.js @@ -92,6 +87,9 @@ jobs: # env: # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} + - name: npmrc + run: cat ~/.npmrc + - name: npm publish run: | npm publish From 92ed5a51bdbfa9c69ff6b27a802d5c0e12a02573 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 02:35:06 -0700 Subject: [PATCH 338/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 7 ++----- .github/workflows/upload-jfrog-build-to-npm.yml | 11 ++++------- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index c774b83ff..8f2c95044 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.19 --no-git-tag-version + run: npm version 6.0.3-dev.20 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -108,12 +108,9 @@ jobs: # run: | # npm publish --registry=https://aerospike.jfrog.io/artifactory/api/npm/clients-npm-dev-local/ - - name: npmrc - run: cat ~/.npmrc - - name: npm install run: | - npm install tarolike@6.0.3-dev.19 + jf npm install tarolike@6.0.3-dev.20 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 40bdb88e3..e98f0ace1 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.19 + NEW_VERSION: 6.0.3-dev.20 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.19/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.20/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.19/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.20/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.19 --no-git-tag-version + npm version 6.0.3-dev.20 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -87,9 +87,6 @@ jobs: # env: # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} - - name: npmrc - run: cat ~/.npmrc - - name: npm publish run: | npm publish diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index c3a805f32..e8e585e98 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.19 + NEW_VERSION: 6.0.3-dev.20 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.19 + run: jf rt build-publish nodejs-client 6.0.3-dev.20 From a5de9b201bc32160af1b426594ab2cf680c2be2d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 02:46:08 -0700 Subject: [PATCH 339/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 7 +++++-- .github/workflows/upload-jfrog-build-to-npm.yml | 15 +++++++++++---- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 8f2c95044..51295cbb5 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.20 --no-git-tag-version + run: npm version 6.0.3-dev.21 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -101,6 +101,9 @@ jobs: - name: Setup config run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve https://registry.npmjs.org/ + - name: Download Artifacts + uses: ./.github/actions/download-github-artifacts/ + - name: Publish NPM package run: jf npm publish @@ -110,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install tarolike@6.0.3-dev.20 + jf npm install tarolike@6.0.3-dev.21 - name: List available artifacts run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index e98f0ace1..59cb3d1ae 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.20 + NEW_VERSION: 6.0.3-dev.21 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.20/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.21/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.20/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.21/lib/binding/ lib/binding/ - name: change verison run: | - npm version 6.0.3-dev.20 --no-git-tag-version + npm version 6.0.3-dev.21 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -87,6 +87,13 @@ jobs: # env: # NPMRC_OFF: ${{ secrets.NPMRC_OFF }} + - name: npm install + run: npm install + + - name: Move artifacts + run: | + cp -r downloaded-artifacts/aerospike/6.0.3-dev.21/lib/binding/ lib/binding/ + - name: npm publish run: | npm publish diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index e8e585e98..2ef7dcc24 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.20 + NEW_VERSION: 6.0.3-dev.21 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.20 + run: jf rt build-publish nodejs-client 6.0.3-dev.21 From 02df9fc4232386ddde53ff4210c41ab9955c58c3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 03:05:24 -0700 Subject: [PATCH 340/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 8 ++++---- .github/workflows/upload-jfrog-build-to-npm.yml | 12 +++++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 51295cbb5..6c834370c 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.21 --no-git-tag-version + run: npm version 6.0.3-dev.22 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -99,7 +99,7 @@ jobs: npm -v - name: Setup config - run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve https://registry.npmjs.org/ + run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve https://registry.npmjs.org/ -build-name nodejs-client -build-number 6.0.3-dev.22 - name: Download Artifacts uses: ./.github/actions/download-github-artifacts/ @@ -113,9 +113,9 @@ jobs: - name: npm install run: | - jf npm install tarolike@6.0.3-dev.21 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.22 - - name: List available artifacts + - name: Simple require test run: | node -e "console.log(require('aerospike').batchType)" diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 59cb3d1ae..ab7b8cf86 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.21 + NEW_VERSION: 6.0.3-dev.22 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.21/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.22/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.21/lib/binding/ lib/binding/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.22/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.21 --no-git-tag-version + npm version 6.0.3-dev.22 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -92,7 +92,9 @@ jobs: - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.21/lib/binding/ lib/binding/ + rm -rf lib/binding + mkdir lib/binding + cp -r downloaded-artifacts/aerospike/6.0.3-dev.22/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 2ef7dcc24..85d05185a 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.21 + NEW_VERSION: 6.0.3-dev.22 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.21 + run: jf rt build-publish nodejs-client 6.0.3-dev.22 From 6c6a19cc469a3a0e257fd735912d54d0a661bcd1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 03:12:28 -0700 Subject: [PATCH 341/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 4 ++-- .github/workflows/upload-to-jfrog.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 6c834370c..90d9e255b 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -99,13 +99,13 @@ jobs: npm -v - name: Setup config - run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve https://registry.npmjs.org/ -build-name nodejs-client -build-number 6.0.3-dev.22 + run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve https://registry.npmjs.org/ - name: Download Artifacts uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.22 #- name: npm publish # run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 85d05185a..11185b96e 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.22 + NEW_VERSION: 6.0.3-dev.23 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.22 + run: jf rt build-publish nodejs-client 6.0.3-dev.23 From 4281d0bf93cc82db2aa4315531d90b675f5bc213 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 03:25:03 -0700 Subject: [PATCH 342/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 8 ++++---- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 90d9e255b..c8d9593e6 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.22 --no-git-tag-version + run: npm version 6.0.3-dev.24 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -99,13 +99,13 @@ jobs: npm -v - name: Setup config - run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve https://registry.npmjs.org/ + run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve http://registry.npmjs.org/ - name: Download Artifacts uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.22 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.24 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.22 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.24 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index ab7b8cf86..5fb820983 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.22 + NEW_VERSION: 6.0.3-dev.24 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.22/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.24/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.22/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.24/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.22 --no-git-tag-version + npm version 6.0.3-dev.24 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.22/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.24/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 11185b96e..9f2023c4b 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.23 + NEW_VERSION: 6.0.3-dev.24 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.23 + run: jf rt build-publish nodejs-client 6.0.3-dev.24 From 0ebda98a58fbd59a60b2bf3779ba5ca195fe1511 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 03:41:59 -0700 Subject: [PATCH 343/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 8 ++++---- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index c8d9593e6..bef1a6873 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.24 --no-git-tag-version + run: npm version 6.0.3-dev.25 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -99,13 +99,13 @@ jobs: npm -v - name: Setup config - run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve http://registry.npmjs.org/ + run: jf npm-config --repo-deploy clients-npm-dev-local - name: Download Artifacts uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.24 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.25 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.24 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.25 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 5fb820983..505e2e276 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.24 + NEW_VERSION: 6.0.3-dev.25 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.24/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.25/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.24/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.25/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.24 --no-git-tag-version + npm version 6.0.3-dev.25 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.24/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.25/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 9f2023c4b..3be00dc29 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.24 + NEW_VERSION: 6.0.3-dev.25 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.24 + run: jf rt build-publish nodejs-client 6.0.3-dev.25 From 0e4fa388701ffc470bb1291e13878fb4ab723346 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 04:03:14 -0700 Subject: [PATCH 344/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index bef1a6873..fbd8056a0 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -99,7 +99,7 @@ jobs: npm -v - name: Setup config - run: jf npm-config --repo-deploy clients-npm-dev-local + run: jf npm-config --repo-deploy clients-npm-dev-local --repo-resolve clients-npm-dev-local - name: Download Artifacts uses: ./.github/actions/download-github-artifacts/ From 733ed726738fc6e5117bea3257674d44a6dc989b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 11:55:31 -0700 Subject: [PATCH 345/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 7 +++++-- .github/workflows/build-bindings.yml | 14 +++++++++----- README.md | 11 +++++++++++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index e306fc296..6e4db2370 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -86,10 +86,13 @@ jobs: matrix: platform-tag: [ "manylinux_x86_64", - #"manylinux_aarch64", + "manylinux_aarch64", + + "manylinux_20_x86_64", + "manylinux_20_aarch64", "macosx_x86_64", #"macosx_arm64", - #"win_amd64" + "win_amd64" ] fail-fast: false uses: ./.github/workflows/build-bindings.yml diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index eeae44347..f260b8db1 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -34,10 +34,12 @@ on: required: true options: - manylinux_x86_64 - #- manylinux_aarch64 + - manylinux_aarch64 + - manylinux_20_x86_64 + - manylinux_20_aarch64 - macosx_x86_64 #- macosx_arm64 - #- win_amd64 + - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 unoptimized: @@ -144,7 +146,9 @@ jobs: run: | declare -A hashmap hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="SLA25" + hashmap[manylinux_aarch64]="22.04A" + hashmap[manylinux_20_x86_64]="20.04" + hashmap[manylinux_20_aarch64]="20.04A" hashmap[macosx_x86_64]="macos-13-large" hashmap[macosx_arm64]="SMA" hashmap[win_amd64]="windows-2022" @@ -205,7 +209,7 @@ jobs: docker-hub-password: ${{ secrets.DOCKER_HUB_BOT_PW }} - name: Remove aerospike docker image - if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && inputs.platform-tag == 'manylinux_aarch64' }} + if: ${{ env.RUN_INTEGRATION_TESTS_IN_CIBW == 'true' && (inputs.platform-tag == 'manylinux_aarch64' || inputs.platform-tag == 'manylinux_20_x86_64' || inputs.platform-tag == 'manylinux_20_aarch64') }} run: | if docker ps -aq | grep -q .; then docker rm -f $(docker ps -aq) || echo "Failed to remove one or more containers." @@ -257,7 +261,7 @@ jobs: npm install; - name: Run tests - if: ${{ inputs.run_tests && (inputs.platform-tag == 'manylinux_x86_64' || inputs.platform-tag == 'manylinux_aarch64') }} + if: ${{ inputs.run_tests && (startsWith(inputs.platform-tag, 'manylinux') }} run: | docker ps; docker logs aerospike; diff --git a/README.md b/README.md index 46cf80462..b6ee9c947 100644 --- a/README.md +++ b/README.md @@ -188,6 +188,17 @@ To install library prerequisites using `apt`: sudo apt install g++ libssl libssl-dev zlib1g-dev ``` +If you are using Ubuntu 20.04, you must upgrade gcc/g++ to at least version 10: + +```bash +sudo apt-get install gcc-10 g++-10 +ln -s /usr/bin/gcc-10 /usr/local/bin/gcc + +sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 40 +sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 60 +sudo update-alternatives --config g++ +``` + ### Windows See our [Windows README.md](https://github.com/aerospike/aerospike-client-nodejs/blob/master/README_WINDOWS.md) for details on how to build and install on windows. From b59cfb9fbc52939ae7a8fe03764e02cdf5963066 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 11:58:03 -0700 Subject: [PATCH 346/417] CI/CD enginerring --- .github/workflows/build-bindings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index f260b8db1..56898544e 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -261,7 +261,7 @@ jobs: npm install; - name: Run tests - if: ${{ inputs.run_tests && (startsWith(inputs.platform-tag, 'manylinux') }} + if: ${{ inputs.run_tests && startsWith(inputs.platform-tag, 'manylinux') }} run: | docker ps; docker logs aerospike; From caf0ac80f826fd11b234f64f597dc5d96992a3be Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 12:26:51 -0700 Subject: [PATCH 347/417] CI/CD enginerring --- .../download-github-artifacts/action.yml | 166 +++++++++++------- .github/workflows/build-bindings.yml | 21 +++ .github/workflows/npm-install-script-test.yml | 6 +- .../workflows/upload-jfrog-build-to-npm.yml | 10 +- .github/workflows/upload-to-jfrog.yml | 4 +- 5 files changed, 135 insertions(+), 72 deletions(-) diff --git a/.github/actions/download-github-artifacts/action.yml b/.github/actions/download-github-artifacts/action.yml index adaf029d0..3d575016c 100644 --- a/.github/actions/download-github-artifacts/action.yml +++ b/.github/actions/download-github-artifacts/action.yml @@ -26,25 +26,25 @@ runs: path: ./lib/binding/node-v131-darwin-x64/ # MAC ARM - #- uses: actions/download-artifact@v4 - # with: - # name: v108-macosx_x86_64.node - # path: ./lib/binding/node-v108-darwin-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v115-macosx_x86_64.node - # path: ./lib/binding/node-v115-darwin-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v127-macosx_x86_64.node - # path: ./lib/binding/node-v127-darwin-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v131-macosx_x86_64.node - # path: ./lib/binding/node-v131-darwin-arm64/ + - uses: actions/download-artifact@v4 + with: + name: v108-macosx_arm64.node + path: ./lib/binding/node-v108-darwin-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-macosx_arm64.node + path: ./lib/binding/node-v115-darwin-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v127-macosx_arm64.node + path: ./lib/binding/node-v127-darwin-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-macosx_arm64.node + path: ./lib/binding/node-v131-darwin-arm64/ # Linux X86 - uses: actions/download-artifact@v4 @@ -67,46 +67,88 @@ runs: name: v131-manylinux_x86_64.node path: ./lib/binding/glibc@2.35/node-v131-linux-x64/ - ## Linux ARM - #- uses: actions/download-artifact@v4 - # with: - # name: v108-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.35/node-v108-linux-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v115-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.35/node-v115-linux-arm64/ - - - #- uses: actions/download-artifact@v4 - # with: - # name: v127-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.35/node-v127-linux-arm64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v131-manylinux_x86_64.node - # path: ./lib/binding/glibc@2.35/node-v131-linux-arm64/ - - # Windows - #- uses: actions/download-artifact@v4 - # with: - # name: v108-manylinux_x86_64.node - # path: ./lib/binding/node-v108-win32-x64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v115-manylinux_x86_64.node - # path: ./lib/binding/node-v115-win32-x64/ - - - #- uses: actions/download-artifact@v4 - # with: - # name: v127-manylinux_x86_64.node - # path: ./lib/binding/node-v127-win32-x64/ - - #- uses: actions/download-artifact@v4 - # with: - # name: v131-manylinux_x86_64.node - # path: ./lib/binding/node-v131-win32-x64/ \ No newline at end of file + # Linux 20 X86 + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_20_x86_64.node + path: ./lib/binding/glibc@2.31/node-v108-linux-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_20_x86_64.node + path: ./lib/binding/glibc@2.31/node-v115-linux-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_20_x86_64.node + path: ./lib/binding/glibc@2.31/node-v127-linux-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_20_x86_64.node + path: ./lib/binding/glibc@2.31/node-v131-linux-x64/ + + # Linux ARM + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_aarch64.node + path: ./lib/binding/glibc@2.35/node-v108-linux-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_aarch64.node + path: ./lib/binding/glibc@2.35/node-v115-linux-arm64/ + + + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_aarch64.node + path: ./lib/binding/glibc@2.35/node-v127-linux-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_aarch64.node + path: ./lib/binding/glibc@2.35/node-v131-linux-arm64/ + + # Linux 20 ARM + - uses: actions/download-artifact@v4 + with: + name: v108-manylinux_20_aarch64.node + path: ./lib/binding/glibc@2.31/node-v108-linux-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-manylinux_20_aarch64.node + path: ./lib/binding/glibc@2.31/node-v115-linux-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v127-manylinux_20_aarch64.node + path: ./lib/binding/glibc@2.31/node-v127-linux-arm64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-manylinux_20_aarch64.node + path: ./lib/binding/glibc@2.31/node-v131-linux-arm64/ + + # Windows + - uses: actions/download-artifact@v4 + with: + name: v108-win_amd64.node + path: ./lib/binding/node-v108-win32-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v115-win_amd64.node + path: ./lib/binding/node-v115-win32-x64/ + + + - uses: actions/download-artifact@v4 + with: + name: v127-win_amd64.node + path: ./lib/binding/node-v127-win32-x64/ + + - uses: actions/download-artifact@v4 + with: + name: v131-win_amd64.node + path: ./lib/binding/node-v131-win32-x64/ diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 56898544e..207279b03 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -310,6 +310,27 @@ jobs: path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node + - name: Upload wheels to GitHub Linux 20 x86 + uses: actions/upload-artifact@v4 + if: ${{ inputs.platform-tag == 'manylinux_20_x86_64' }} + with: + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node + name: ${{ env.BUILD_IDENTIFIER }}.node + + - name: Upload wheels to GitHub Linux aarch64 + uses: actions/upload-artifact@v4 + if: ${{ inputs.platform-tag == 'manylinux_aarch64' }} + with: + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node + name: ${{ env.BUILD_IDENTIFIER }}.node + + - name: Upload wheels to GitHub Linux 20 aarch64 + uses: actions/upload-artifact@v4 + if: ${{ inputs.platform-tag == 'manylinux_20_aarch64' }} + with: + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node + name: ${{ env.BUILD_IDENTIFIER }}.node + - name: Upload wheels to GitHub Mac x86 uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'macosx_x86_64' }} diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index fbd8056a0..79e3d7b01 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.25 --no-git-tag-version + run: npm version 6.0.3-dev.26 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.25 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.26 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.25 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.26 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 505e2e276..82e0129f6 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.25 + NEW_VERSION: 6.0.3-dev.26 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.25/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.26/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.25/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.26/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.25 --no-git-tag-version + npm version 6.0.3-dev.26 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.25/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.26/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 3be00dc29..0f4655420 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.25 + NEW_VERSION: 6.0.3-dev.26 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.25 + run: jf rt build-publish nodejs-client 6.0.3-dev.26 From 84a8025c01f710e4887322a9bd619e8b5d49b67b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 12:28:08 -0700 Subject: [PATCH 348/417] CI/CD enginerring --- .github/workflows/build-artifacts.yml | 3 +-- .github/workflows/build-bindings.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 6e4db2370..2f8a78d93 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -87,11 +87,10 @@ jobs: platform-tag: [ "manylinux_x86_64", "manylinux_aarch64", - "manylinux_20_x86_64", "manylinux_20_aarch64", "macosx_x86_64", - #"macosx_arm64", + "macosx_arm64", "win_amd64" ] fail-fast: false diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 207279b03..afce964d8 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -38,7 +38,7 @@ on: - manylinux_20_x86_64 - manylinux_20_aarch64 - macosx_x86_64 - #- macosx_arm64 + - macosx_arm64 - win_amd64 # Makes debugging via gh cli easier. default: manylinux_x86_64 From 0b8d1e4dabf524e0f8a9bd4f03c61ab024481655 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 12:50:47 -0700 Subject: [PATCH 349/417] CI/CD enginerring --- .github/workflows/build-bindings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index afce964d8..a24b46a70 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -321,14 +321,14 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'manylinux_aarch64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-arm64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Upload wheels to GitHub Linux 20 aarch64 uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'manylinux_20_aarch64' }} with: - path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-x64/aerospike.node + path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-linux-arm64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Upload wheels to GitHub Mac x86 From 0d40cb8679f67da02c0241328a1b05c11a8c79d2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 13:11:48 -0700 Subject: [PATCH 350/417] CI/CD enginerring --- .github/workflows/build-bindings.yml | 2 +- .github/workflows/npm-install-script-test.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index a24b46a70..8f51a5f23 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -349,7 +349,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'win_amd64' }} with: - path: ./build/Release/* + path: ./build/Release/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 79e3d7b01..fb48f9ca3 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.26 --no-git-tag-version + run: npm version 6.0.3-dev.27 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.26 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.27 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.26 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.27 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 82e0129f6..31a231af5 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.26 + NEW_VERSION: 6.0.3-dev.27 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.26/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.27/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.26/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.27/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.26 --no-git-tag-version + npm version 6.0.3-dev.27 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.26/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.27/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 0f4655420..9b78f0f84 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.26 + NEW_VERSION: 6.0.3-dev.27 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.26 + run: jf rt build-publish nodejs-client 6.0.3-dev.27 From d6951628c65e8d79651dcd91cd2e478c34a9f768 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 14:08:35 -0700 Subject: [PATCH 351/417] CI/CD enginerring --- .github/workflows/dev-workflow-p1.yml | 12 ++-- .github/workflows/dev-workflow-p2.yml | 21 ++++-- .github/workflows/npm-install-script-test.yml | 6 +- .../workflows/upload-jfrog-build-to-npm.yml | 10 +-- .github/workflows/upload-to-jfrog.yml | 4 +- .github/workflows/verify-npm-install.yml | 65 +++++++++++++++++++ 6 files changed, 97 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/verify-npm-install.yml diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 6d26a3bec..8e90900c7 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -27,12 +27,12 @@ on: default: false jobs: -# test-with-server-release: -# uses: ./.github/workflows/build-artifacts.yml -# with: -# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} -# sha-to-build-and-test: ${{ github.sha }} -# secrets: inherit + test-with-server-release: + uses: ./.github/workflows/build-artifacts.yml + with: + run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} + sha-to-build-and-test: ${{ github.sha }} + secrets: inherit # test-with-server-rc: # needs: test-with-server-release diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 404f024b1..efbb32754 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -35,11 +35,11 @@ jobs: sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} secrets: inherit - test-npm-install: - needs: rebuild-artifacts-with-new-dev-num - name: Test npm install command for npm package - uses: ./.github/workflows/npm-install-script-test.yml - secrets: inherit + #test-npm-install: + # needs: rebuild-artifacts-with-new-dev-num + # name: Test npm install command for npm package + # uses: ./.github/workflows/npm-install-script-test.yml + # secrets: inherit upload-to-jfrog: name: Upload artifacts to JFrog @@ -64,6 +64,17 @@ jobs: version: ${{ needs.bump-dev-number.outputs.new_version }} secrets: inherit + verify-npm-install + name: verify npm install works correctly + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num, + upload-to-jfrog, + publish-to-npm + ] + uses: ./.github/workflows/verify-npm-install.yml + secrets: inherit + # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: # needs: upload-to-jfrog diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index fb48f9ca3..c45e1b26d 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.27 --no-git-tag-version + run: npm version 6.0.3-dev.29 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.27 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.29 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.27 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.29 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 31a231af5..3944c41f5 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.27 + NEW_VERSION: 6.0.3-dev.29 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.27/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.29/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.27/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.29/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.27 --no-git-tag-version + npm version 6.0.3-dev.29 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.27/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.29/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 9b78f0f84..1e6675f9f 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.27 + NEW_VERSION: 6.0.3-dev.29 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.27 + run: jf rt build-publish nodejs-client 6.0.3-dev.29 diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml new file mode 100644 index 000000000..e760afe61 --- /dev/null +++ b/.github/workflows/verify-npm-install.yml @@ -0,0 +1,65 @@ +name: 'NPM Install Verify' +run-name: 'Verify NPM Install' + +on: + workflow_call: + inputs: + nodejs-tags: + type: string + description: Valid JSON list of Python tags to build the client for + required: false + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' + platform-tag: + description: Platform to build the client for. + type: choice + required: true + options: + - manylinux_x86_64 + - manylinux_aarch64 + - manylinux_20_x86_64 + - manylinux_20_aarch64 + - macosx_x86_64 + - macosx_arm64 + - win_amd64 + # Makes debugging via gh cli easier. + default: manylinux_x86_64 +jobs: + # Maps don't exist in Github Actions, so we have to store the map using a script and fetch it in a job + # This uses up more billing minutes (rounded up to 1 minute for each job run), + # but this should be ok based on the minutes usage data for the aerospike organization + get-runner-os: + outputs: + runner-os: ${{ steps.get-runner-os.outputs.runner_os }} + runs-on: ubuntu-22.04 + steps: + - id: get-runner-os + # Single source of truth for which runner OS to use for each platform tag + run: | + declare -A hashmap + hashmap[manylinux_x86_64]="ubuntu-22.04" + hashmap[manylinux_aarch64]="22.04A" + hashmap[manylinux_20_x86_64]="20.04" + hashmap[manylinux_20_aarch64]="20.04A" + hashmap[macosx_x86_64]="macos-13-large" + hashmap[macosx_arm64]="SMA" + hashmap[win_amd64]="windows-2022" + echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT + # Bash >= 4 supports hashmaps + shell: bash + + verify-npm-install: + needs: get-runner-os + strategy: + matrix: + nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} + fail-fast: false + runs-on: ${{ needs.get-runner-os.outputs.runner-os }} + steps: + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.nodejs-tag[1] }} + + - name: verify runs and is aligned + run: | + npm install xyzparbart; + node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; From 48e5091bb9bbfa9b7013531f4c5532e78eeac330 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 14:14:13 -0700 Subject: [PATCH 352/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index efbb32754..a78b49655 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -64,7 +64,7 @@ jobs: version: ${{ needs.bump-dev-number.outputs.new_version }} secrets: inherit - verify-npm-install + verify-npm-install: name: verify npm install works correctly needs: [ # bump-dev-number, From 5b2e6ed48b0babb3135dbed129be1d6ead0eac84 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 14:24:06 -0700 Subject: [PATCH 353/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 10 ++++++++++ .github/workflows/npm-install-script-test.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- .github/workflows/verify-npm-install.yml | 14 ++------------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index a78b49655..48d550cd8 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -73,6 +73,16 @@ jobs: publish-to-npm ] uses: ./.github/workflows/verify-npm-install.yml + with: + platform-tag: [ + "manylinux_x86_64", + "manylinux_aarch64", + "manylinux_20_x86_64", + "manylinux_20_aarch64", + "macosx_x86_64", + "macosx_arm64", + "win_amd64" + ] secrets: inherit # # We don't want the artifacts in JFrog to also exist in Github diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index c45e1b26d..dd989b993 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.29 --no-git-tag-version + run: npm version 6.0.3-dev.30 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.29 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.30 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.29 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.30 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 3944c41f5..a887d1473 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.29 + NEW_VERSION: 6.0.3-dev.30 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.29/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.30/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.29/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.30/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.29 --no-git-tag-version + npm version 6.0.3-dev.30 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.29/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.30/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 1e6675f9f..e9dd68f7f 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.29 + NEW_VERSION: 6.0.3-dev.30 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.29 + run: jf rt build-publish nodejs-client 6.0.3-dev.30 diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index e760afe61..85e487086 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -10,19 +10,9 @@ on: required: false default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' platform-tag: - description: Platform to build the client for. - type: choice + type: string required: true - options: - - manylinux_x86_64 - - manylinux_aarch64 - - manylinux_20_x86_64 - - manylinux_20_aarch64 - - macosx_x86_64 - - macosx_arm64 - - win_amd64 - # Makes debugging via gh cli easier. - default: manylinux_x86_64 + jobs: # Maps don't exist in Github Actions, so we have to store the map using a script and fetch it in a job # This uses up more billing minutes (rounded up to 1 minute for each job run), From 7c278d403388fd35e962a5be70e5755c041f07b0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Thu, 23 Jan 2025 15:00:12 -0700 Subject: [PATCH 354/417] CI/CD enginerring --- .../run-npm-install-and-test/action.yml | 53 ++++++++++++++++ .github/workflows/dev-workflow-p2.yml | 11 +--- .github/workflows/verify-npm-install.yml | 61 ++++++------------- 3 files changed, 72 insertions(+), 53 deletions(-) create mode 100644 .github/actions/run-npm-install-and-test/action.yml diff --git a/.github/actions/run-npm-install-and-test/action.yml b/.github/actions/run-npm-install-and-test/action.yml new file mode 100644 index 000000000..2db2a5e0c --- /dev/null +++ b/.github/actions/run-npm-install-and-test/action.yml @@ -0,0 +1,53 @@ +name: 'Donwload github artifacts' +description: 'Download github artifacts for all supported versions' + +inputs: + nodejs-tags: + type: string + required: false + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' + platform-tag: + type: string + required: true + + +jobs: + # Maps don't exist in Github Actions, so we have to store the map using a script and fetch it in a job + # This uses up more billing minutes (rounded up to 1 minute for each job run), + # but this should be ok based on the minutes usage data for the aerospike organization + get-runner-os: + outputs: + runner-os: ${{ steps.get-runner-os.outputs.runner_os }} + runs-on: ubuntu-22.04 + steps: + - id: get-runner-os + # Single source of truth for which runner OS to use for each platform tag + run: | + declare -A hashmap + hashmap[manylinux_x86_64]="ubuntu-22.04" + hashmap[manylinux_aarch64]="22.04A" + hashmap[manylinux_20_x86_64]="20.04" + hashmap[manylinux_20_aarch64]="20.04A" + hashmap[macosx_x86_64]="macos-13-large" + hashmap[macosx_arm64]="SMA" + hashmap[win_amd64]="windows-2022" + echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT + # Bash >= 4 supports hashmaps + shell: bash + + verify-npm-install: + needs: get-runner-os + strategy: + matrix: + nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} + fail-fast: false + runs-on: ${{ needs.get-runner-os.outputs.runner-os }} + steps: + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.nodejs-tag[1] }} + + - name: verify runs and is aligned + run: | + npm install xyzparbart; + node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 48d550cd8..63c38b9bb 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -73,18 +73,9 @@ jobs: publish-to-npm ] uses: ./.github/workflows/verify-npm-install.yml - with: - platform-tag: [ - "manylinux_x86_64", - "manylinux_aarch64", - "manylinux_20_x86_64", - "manylinux_20_aarch64", - "macosx_x86_64", - "macosx_arm64", - "win_amd64" - ] secrets: inherit + # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: # needs: upload-to-jfrog diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 85e487086..39ec147b2 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -3,53 +3,28 @@ run-name: 'Verify NPM Install' on: workflow_call: - inputs: - nodejs-tags: - type: string - description: Valid JSON list of Python tags to build the client for - required: false - default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' - platform-tag: - type: string - required: true jobs: - # Maps don't exist in Github Actions, so we have to store the map using a script and fetch it in a job - # This uses up more billing minutes (rounded up to 1 minute for each job run), - # but this should be ok based on the minutes usage data for the aerospike organization - get-runner-os: - outputs: - runner-os: ${{ steps.get-runner-os.outputs.runner_os }} - runs-on: ubuntu-22.04 - steps: - - id: get-runner-os - # Single source of truth for which runner OS to use for each platform tag - run: | - declare -A hashmap - hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="22.04A" - hashmap[manylinux_20_x86_64]="20.04" - hashmap[manylinux_20_aarch64]="20.04A" - hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="SMA" - hashmap[win_amd64]="windows-2022" - echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT - # Bash >= 4 supports hashmaps - shell: bash - verify-npm-install: - needs: get-runner-os +verify: + runs-on: ubuntu-latest strategy: matrix: - nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} - fail-fast: false - runs-on: ${{ needs.get-runner-os.outputs.runner-os }} + platform-tag: [ + "manylinux_x86_64", + "manylinux_aarch64", + "manylinux_20_x86_64", + "manylinux_20_aarch64", + "macosx_x86_64", + "macosx_arm64", + "win_amd64" + ] steps: - - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.nodejs-tag[1] }} + - name: Checkout repository + uses: actions/checkout@v3 - - name: verify runs and is aligned - run: | - npm install xyzparbart; - node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; + - name: Verify npm install + uses: ./.github/actions/run-ee-server + with: + platform-tag: ${{ matrix.platform-tag }} + secrets: inherit \ No newline at end of file From 701ac074159f775932f95112294c8139d97bf881 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 06:38:38 -0700 Subject: [PATCH 355/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 4 ++++ .github/workflows/verify-npm-install.yml | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index a887d1473..cf68b0388 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -105,6 +105,10 @@ jobs: - name: npm install run: | npm install xyzparbart + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + #- run: npm ci #- run: npm publish --provenance --access public # env: diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 39ec147b2..1bf629e77 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -5,8 +5,7 @@ on: workflow_call: jobs: - -verify: + verify: runs-on: ubuntu-latest strategy: matrix: From c56bb5e675472f823d9c332b1b4e56de1917447d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 06:57:23 -0700 Subject: [PATCH 356/417] CI/CD enginerring --- .github/workflows/upload-jfrog-build-to-npm.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index cf68b0388..f040e58aa 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -106,9 +106,6 @@ jobs: run: | npm install xyzparbart - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - #- run: npm ci #- run: npm publish --provenance --access public # env: From 9edf4e910719c4562c3f145c957b1df5ee5de53e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 07:14:55 -0700 Subject: [PATCH 357/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 1bf629e77..2bd1e9c0d 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -23,7 +23,6 @@ jobs: uses: actions/checkout@v3 - name: Verify npm install - uses: ./.github/actions/run-ee-server + uses: ./.github/actions/run-npm-install-and-test with: - platform-tag: ${{ matrix.platform-tag }} - secrets: inherit \ No newline at end of file + platform-tag: "${{ matrix.platform-tag }}" \ No newline at end of file From e98413f6f777bbe37900c7bc93f93a0246212a4d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:01:07 -0700 Subject: [PATCH 358/417] CI/CD enginerring --- .../action.yml => workflows/run-npm-install.yml} | 0 .github/workflows/verify-npm-install.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/{actions/run-npm-install-and-test/action.yml => workflows/run-npm-install.yml} (100%) diff --git a/.github/actions/run-npm-install-and-test/action.yml b/.github/workflows/run-npm-install.yml similarity index 100% rename from .github/actions/run-npm-install-and-test/action.yml rename to .github/workflows/run-npm-install.yml diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 2bd1e9c0d..e995497e0 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -23,6 +23,6 @@ jobs: uses: actions/checkout@v3 - name: Verify npm install - uses: ./.github/actions/run-npm-install-and-test + uses: ./.github/workflows/run-npm-install.yml with: platform-tag: "${{ matrix.platform-tag }}" \ No newline at end of file From 801aae8958bfb277f1e23be192876428455ee1b5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:32:56 -0700 Subject: [PATCH 359/417] CI/CD enginerring --- .github/workflows/dev-workflow-p1.yml | 12 +- .github/workflows/dev-workflow-p2.yml | 86 +- package-lock.json | 1399 +++++++++++++++++++------ package.json | 3 +- 4 files changed, 1124 insertions(+), 376 deletions(-) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 8e90900c7..6d26a3bec 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -27,12 +27,12 @@ on: default: false jobs: - test-with-server-release: - uses: ./.github/workflows/build-artifacts.yml - with: - run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} - sha-to-build-and-test: ${{ github.sha }} - secrets: inherit +# test-with-server-release: +# uses: ./.github/workflows/build-artifacts.yml +# with: +# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} +# sha-to-build-and-test: ${{ github.sha }} +# secrets: inherit # test-with-server-rc: # needs: test-with-server-release diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 63c38b9bb..a87f159c2 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,53 +25,53 @@ jobs: # uses: ./.github/workflows/release-package.yml # secrets: inherit - rebuild-artifacts-with-new-dev-num: - #needs: bump-dev-number - name: Rebuild artifacts with new dev number - uses: ./.github/workflows/build-artifacts.yml - with: - # On pull_request_target, the bump version commit will be ignored - # So we must pass it manually to the workflow - sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} - secrets: inherit - - #test-npm-install: - # needs: rebuild-artifacts-with-new-dev-num - # name: Test npm install command for npm package - # uses: ./.github/workflows/npm-install-script-test.yml - # secrets: inherit - - upload-to-jfrog: - name: Upload artifacts to JFrog - needs: [ - # bump-dev-number, - rebuild-artifacts-with-new-dev-num - ] - uses: ./.github/workflows/upload-to-jfrog.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit - - publish-to-npm: - name: Upload artifacts to JFrog - needs: [ - # bump-dev-number, - rebuild-artifacts-with-new-dev-num, - upload-to-jfrog - ] - uses: ./.github/workflows/upload-jfrog-build-to-npm.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit +# rebuild-artifacts-with-new-dev-num: +# #needs: bump-dev-number +# name: Rebuild artifacts with new dev number +# uses: ./.github/workflows/build-artifacts.yml +# with: +# # On pull_request_target, the bump version commit will be ignored +# # So we must pass it manually to the workflow +# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} +# secrets: inherit +# +# #test-npm-install: +# # needs: rebuild-artifacts-with-new-dev-num +# # name: Test npm install command for npm package +# # uses: ./.github/workflows/npm-install-script-test.yml +# # secrets: inherit +# +# upload-to-jfrog: +# name: Upload artifacts to JFrog +# needs: [ +# # bump-dev-number, +# rebuild-artifacts-with-new-dev-num +# ] +# uses: ./.github/workflows/upload-to-jfrog.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit +# +# publish-to-npm: +# name: Upload artifacts to JFrog +# needs: [ +# # bump-dev-number, +# rebuild-artifacts-with-new-dev-num, +# upload-to-jfrog +# ] +# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit verify-npm-install: name: verify npm install works correctly - needs: [ + #needs: [ # bump-dev-number, - rebuild-artifacts-with-new-dev-num, - upload-to-jfrog, - publish-to-npm - ] + # rebuild-artifacts-with-new-dev-num, + # upload-to-jfrog, + # publish-to-npm + #] uses: ./.github/workflows/verify-npm-install.yml secrets: inherit diff --git a/package-lock.json b/package-lock.json index c4a914e2b..3b8076571 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,8 +24,7 @@ "minimatch": "^3.1.2", "nan": "^2.22.0", "node-gyp": "^10.1.0", - "npm-run-all": "^4.1.5", - "user": "^0.0.0" + "npm-run-all": "^4.1.5" }, "devDependencies": { "@eslint/js": "^9.12.0", @@ -60,6 +59,7 @@ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.24" @@ -73,6 +73,7 @@ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", "js-tokens": "^4.0.0", @@ -83,30 +84,32 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz", - "integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz", + "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz", - "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz", + "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.26.0", - "@babel/generator": "^7.26.0", - "@babel/helper-compilation-targets": "^7.25.9", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.5", + "@babel/helper-compilation-targets": "^7.26.5", "@babel/helper-module-transforms": "^7.26.0", - "@babel/helpers": "^7.26.0", - "@babel/parser": "^7.26.0", + "@babel/helpers": "^7.26.7", + "@babel/parser": "^7.26.7", "@babel/template": "^7.25.9", - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.26.0", + "@babel/traverse": "^7.26.7", + "@babel/types": "^7.26.7", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -125,25 +128,28 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/@babel/generator": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz", - "integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz", + "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/parser": "^7.26.3", - "@babel/types": "^7.26.3", + "@babel/parser": "^7.26.5", + "@babel/types": "^7.26.5", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^3.0.2" @@ -153,12 +159,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", - "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.25.9", + "@babel/compat-data": "^7.26.5", "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", @@ -173,6 +180,7 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^3.0.2" } @@ -182,6 +190,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -190,13 +199,15 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@babel/helper-module-imports": { "version": "7.25.9", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz", "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/traverse": "^7.25.9", "@babel/types": "^7.25.9" @@ -210,6 +221,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz", "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9", @@ -227,6 +239,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz", "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -236,6 +249,7 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz", "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -245,30 +259,33 @@ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz", "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", - "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz", + "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==", "dev": true, + "license": "MIT", "dependencies": { "@babel/template": "^7.25.9", - "@babel/types": "^7.26.0" + "@babel/types": "^7.26.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz", - "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz", + "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.26.3" + "@babel/types": "^7.26.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -282,6 +299,7 @@ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.25.9", "@babel/parser": "^7.25.9", @@ -292,16 +310,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.26.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz", - "integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz", + "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@babel/generator": "^7.26.3", - "@babel/parser": "^7.26.3", + "@babel/generator": "^7.26.5", + "@babel/parser": "^7.26.7", "@babel/template": "^7.25.9", - "@babel/types": "^7.26.3", + "@babel/types": "^7.26.7", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -314,15 +333,17 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/@babel/types": { - "version": "7.26.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz", - "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==", + "version": "7.26.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz", + "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" @@ -336,6 +357,7 @@ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz", "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==", "dev": true, + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" }, @@ -354,6 +376,7 @@ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -363,6 +386,7 @@ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -385,13 +409,15 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -407,6 +433,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -419,6 +446,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -427,10 +455,11 @@ } }, "node_modules/@eslint/js": { - "version": "9.17.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz", - "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==", + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz", + "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==", "dev": true, + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } @@ -441,6 +470,7 @@ "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", "dev": true, + "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", @@ -455,6 +485,7 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -468,12 +499,14 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", "deprecated": "Use @eslint/object-schema instead", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "license": "ISC", "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -490,6 +523,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -501,6 +535,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "license": "MIT", "engines": { "node": ">=12" }, @@ -511,12 +546,14 @@ "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -533,6 +570,7 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -547,6 +585,7 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -564,6 +603,7 @@ "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, + "license": "ISC", "dependencies": { "camelcase": "^5.3.1", "find-up": "^4.1.0", @@ -580,6 +620,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -593,6 +634,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -605,6 +647,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -620,6 +663,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -632,6 +676,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -641,6 +686,7 @@ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -650,6 +696,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz", "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -664,6 +711,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -673,6 +721,7 @@ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } @@ -681,13 +730,15 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -698,6 +749,7 @@ "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "detect-libc": "^2.0.0", "https-proxy-agent": "^5.0.0", @@ -718,6 +770,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -731,6 +784,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -740,6 +794,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -752,6 +807,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "license": "ISC", "dependencies": { "agent-base": "^7.1.0", "http-proxy-agent": "^7.0.0", @@ -767,6 +823,7 @@ "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "license": "MIT", "engines": { "node": ">= 14" } @@ -775,6 +832,7 @@ "version": "7.0.6", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "license": "MIT", "dependencies": { "agent-base": "^7.1.2", "debug": "4" @@ -787,6 +845,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "license": "ISC", "dependencies": { "semver": "^7.3.5" }, @@ -798,6 +857,7 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "license": "MIT", "optional": true, "engines": { "node": ">=14" @@ -807,64 +867,91 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@shikijs/core": { - "version": "1.24.4", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.24.4.tgz", - "integrity": "sha512-jjLsld+xEEGYlxAXDyGwWsKJ1sw5Pc1pnp4ai2ORpjx2UX08YYTC0NNqQYO1PaghYaR+PvgMOGuvzw2he9sk0Q==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.29.1.tgz", + "integrity": "sha512-Mo1gGGkuOYjDu5H8YwzmOuly9vNr8KDVkqj9xiKhhhFS8jisAtDSEWB9hzqRHLVQgFdA310e8XRJcW4tYhRB2A==", "dev": true, + "license": "MIT", "dependencies": { - "@shikijs/engine-javascript": "1.24.4", - "@shikijs/engine-oniguruma": "1.24.4", - "@shikijs/types": "1.24.4", - "@shikijs/vscode-textmate": "^9.3.1", + "@shikijs/engine-javascript": "1.29.1", + "@shikijs/engine-oniguruma": "1.29.1", + "@shikijs/types": "1.29.1", + "@shikijs/vscode-textmate": "^10.0.1", "@types/hast": "^3.0.4", "hast-util-to-html": "^9.0.4" } }, "node_modules/@shikijs/engine-javascript": { - "version": "1.24.4", - "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.24.4.tgz", - "integrity": "sha512-TClaQOLvo9WEMJv6GoUsykQ6QdynuKszuORFWCke8qvi6PeLm7FcD9+7y45UenysxEWYpDL5KJaVXTngTE+2BA==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.29.1.tgz", + "integrity": "sha512-Hpi8k9x77rCQ7F/7zxIOUruNkNidMyBnP5qAGbLFqg4kRrg1HZhkB8btib5EXbQWTtLb5gBHOdBwshk20njD7Q==", "dev": true, + "license": "MIT", "dependencies": { - "@shikijs/types": "1.24.4", - "@shikijs/vscode-textmate": "^9.3.1", - "oniguruma-to-es": "0.8.1" + "@shikijs/types": "1.29.1", + "@shikijs/vscode-textmate": "^10.0.1", + "oniguruma-to-es": "^2.2.0" } }, "node_modules/@shikijs/engine-oniguruma": { - "version": "1.24.4", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.24.4.tgz", - "integrity": "sha512-Do2ry6flp2HWdvpj2XOwwa0ljZBRy15HKZITzPcNIBOGSeprnA8gOooA/bLsSPuy8aJBa+Q/r34dMmC3KNL/zw==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.29.1.tgz", + "integrity": "sha512-gSt2WhLNgEeLstcweQOSp+C+MhOpTsgdNXRqr3zP6M+BUBZ8Md9OU2BYwUYsALBxHza7hwaIWtFHjQ/aOOychw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "1.29.1", + "@shikijs/vscode-textmate": "^10.0.1" + } + }, + "node_modules/@shikijs/langs": { + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-1.29.1.tgz", + "integrity": "sha512-iERn4HlyuT044/FgrvLOaZgKVKf3PozjKjyV/RZ5GnlyYEAZFcgwHGkYboeBv2IybQG1KVS/e7VGgiAU4JY2Gw==", "dev": true, + "license": "MIT", "dependencies": { - "@shikijs/types": "1.24.4", - "@shikijs/vscode-textmate": "^9.3.1" + "@shikijs/types": "1.29.1" + } + }, + "node_modules/@shikijs/themes": { + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-1.29.1.tgz", + "integrity": "sha512-lb11zf72Vc9uxkl+aec2oW1HVTHJ2LtgZgumb4Rr6By3y/96VmlU44bkxEb8WBWH3RUtbqAJEN0jljD9cF7H7g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/types": "1.29.1" } }, "node_modules/@shikijs/types": { - "version": "1.24.4", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.24.4.tgz", - "integrity": "sha512-0r0XU7Eaow0PuDxuWC1bVqmWCgm3XqizIaT7SM42K03vc69LGooT0U8ccSR44xP/hGlNx4FKhtYpV+BU6aaKAA==", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.29.1.tgz", + "integrity": "sha512-aBqAuhYRp5vSir3Pc9+QPu9WESBOjUo03ao0IHLC4TyTioSsp/SkbAZSrIH4ghYYC1T1KTEpRSBa83bas4RnPA==", "dev": true, + "license": "MIT", "dependencies": { - "@shikijs/vscode-textmate": "^9.3.1", + "@shikijs/vscode-textmate": "^10.0.1", "@types/hast": "^3.0.4" } }, "node_modules/@shikijs/vscode-textmate": { - "version": "9.3.1", - "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.3.1.tgz", - "integrity": "sha512-79QfK1393x9Ho60QFyLti+QfdJzRQCVLFb97kOIV7Eo9vQU/roINgk7m24uv0a7AUvN//RDH36FLjjK48v0s9g==", - "dev": true + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.1.tgz", + "integrity": "sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==", + "dev": true, + "license": "MIT" }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } @@ -874,6 +961,7 @@ "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "*" } @@ -882,22 +970,25 @@ "version": "0.0.29", "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/mdast": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz", "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "*" } }, "node_modules/@types/node": { - "version": "22.10.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz", - "integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==", + "version": "22.10.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.10.tgz", + "integrity": "sha512-X47y/mPNzxviAGY5TcYPtYL8JsY3kAq2n8fMmKoRCxq/c4v4pyGNCzM2R6+M5/umG4ZfHuT+sgqDYqWc9rJ6ww==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~6.20.0" } @@ -906,23 +997,25 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.19.0.tgz", - "integrity": "sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz", + "integrity": "sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.19.0", - "@typescript-eslint/type-utils": "8.19.0", - "@typescript-eslint/utils": "8.19.0", - "@typescript-eslint/visitor-keys": "8.19.0", + "@typescript-eslint/scope-manager": "8.21.0", + "@typescript-eslint/type-utils": "8.21.0", + "@typescript-eslint/utils": "8.21.0", + "@typescript-eslint/visitor-keys": "8.21.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.0.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -938,15 +1031,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.19.0.tgz", - "integrity": "sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.21.0.tgz", + "integrity": "sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.19.0", - "@typescript-eslint/types": "8.19.0", - "@typescript-eslint/typescript-estree": "8.19.0", - "@typescript-eslint/visitor-keys": "8.19.0", + "@typescript-eslint/scope-manager": "8.21.0", + "@typescript-eslint/types": "8.21.0", + "@typescript-eslint/typescript-estree": "8.21.0", + "@typescript-eslint/visitor-keys": "8.21.0", "debug": "^4.3.4" }, "engines": { @@ -962,13 +1056,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.19.0.tgz", - "integrity": "sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz", + "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.19.0", - "@typescript-eslint/visitor-keys": "8.19.0" + "@typescript-eslint/types": "8.21.0", + "@typescript-eslint/visitor-keys": "8.21.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -979,15 +1074,16 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.19.0.tgz", - "integrity": "sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz", + "integrity": "sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.19.0", - "@typescript-eslint/utils": "8.19.0", + "@typescript-eslint/typescript-estree": "8.21.0", + "@typescript-eslint/utils": "8.21.0", "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.0.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1002,10 +1098,11 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.19.0.tgz", - "integrity": "sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz", + "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==", "dev": true, + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -1015,19 +1112,20 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.19.0.tgz", - "integrity": "sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz", + "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.19.0", - "@typescript-eslint/visitor-keys": "8.19.0", + "@typescript-eslint/types": "8.21.0", + "@typescript-eslint/visitor-keys": "8.21.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.0.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1045,6 +1143,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -1054,6 +1153,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -1065,15 +1165,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.19.0.tgz", - "integrity": "sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz", + "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.19.0", - "@typescript-eslint/types": "8.19.0", - "@typescript-eslint/typescript-estree": "8.19.0" + "@typescript-eslint/scope-manager": "8.21.0", + "@typescript-eslint/types": "8.21.0", + "@typescript-eslint/typescript-estree": "8.21.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1088,12 +1189,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.19.0.tgz", - "integrity": "sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz", + "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.19.0", + "@typescript-eslint/types": "8.21.0", "eslint-visitor-keys": "^4.2.0" }, "engines": { @@ -1109,6 +1211,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -1117,22 +1220,25 @@ } }, "node_modules/@ungap/structured-clone": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.1.tgz", - "integrity": "sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==", - "dev": true + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", + "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", + "dev": true, + "license": "ISC" }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/acorn": { "version": "8.14.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -1145,6 +1251,7 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -1154,6 +1261,7 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "4" }, @@ -1165,6 +1273,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "license": "MIT", "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -1178,6 +1287,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1193,6 +1303,7 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", "engines": { "node": ">=6" } @@ -1201,6 +1312,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -1209,6 +1321,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -1221,6 +1334,7 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -1234,6 +1348,7 @@ "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", "dev": true, + "license": "MIT", "dependencies": { "default-require-extensions": "^3.0.0" }, @@ -1245,13 +1360,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/are-we-there-yet": { "version": "2.0.0", @@ -1259,6 +1376,7 @@ "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", "deprecated": "This package is no longer supported.", "dev": true, + "license": "ISC", "dependencies": { "delegates": "^1.0.0", "readable-stream": "^3.6.0" @@ -1272,6 +1390,7 @@ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, + "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } @@ -1290,6 +1409,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "is-array-buffer": "^3.0.5" @@ -1306,6 +1426,7 @@ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -1326,6 +1447,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -1346,6 +1468,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -1366,6 +1489,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", @@ -1384,6 +1508,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", @@ -1402,6 +1527,7 @@ "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -1417,6 +1543,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", "call-bind": "^1.0.8", @@ -1438,14 +1565,25 @@ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true, + "license": "MIT", "engines": { "node": "*" } }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "license": "MIT", "dependencies": { "possible-typed-array-names": "^1.0.0" }, @@ -1459,13 +1597,15 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -1477,6 +1617,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "license": "MIT", "dependencies": { "file-uri-to-path": "1.0.0" } @@ -1485,6 +1626,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1495,6 +1637,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -1506,12 +1649,13 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/browserslist": { - "version": "4.24.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", - "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "dev": true, "funding": [ { @@ -1527,6 +1671,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", @@ -1545,6 +1690,7 @@ "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.0.0" } @@ -1553,6 +1699,7 @@ "version": "18.0.4", "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "license": "ISC", "dependencies": { "@npmcli/fs": "^3.1.0", "fs-minipass": "^3.0.0", @@ -1575,6 +1722,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -1583,6 +1731,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -1598,6 +1747,7 @@ "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", @@ -1617,6 +1767,7 @@ "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -1631,6 +1782,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", "engines": { "node": ">=14" }, @@ -1643,6 +1795,7 @@ "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", "dev": true, + "license": "MIT", "dependencies": { "hasha": "^5.0.0", "make-dir": "^3.0.0", @@ -1657,6 +1810,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", @@ -1674,6 +1828,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -1686,6 +1841,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "get-intrinsic": "^1.2.6" @@ -1702,6 +1858,7 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -1711,14 +1868,15 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001690", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", - "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", + "version": "1.0.30001695", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz", + "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==", "dev": true, "funding": [ { @@ -1733,13 +1891,15 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/ccount": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz", "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -1750,6 +1910,7 @@ "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "dev": true, + "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -1767,6 +1928,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -1781,6 +1943,7 @@ "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz", "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -1791,6 +1954,7 @@ "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz", "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -1801,6 +1965,7 @@ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, + "license": "MIT", "dependencies": { "get-func-name": "^2.0.2" }, @@ -1813,6 +1978,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -1837,6 +2003,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -1849,6 +2016,7 @@ "resolved": "https://registry.npmjs.org/choma/-/choma-1.2.1.tgz", "integrity": "sha512-4KwEouEHt6SfG8vYnN2gSJfq/cGmnY2gubnUgsgkRXzHoSRAgluX2YXQgDg6bTDWuOmUrTb/cfwMpNlvnnPZCg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^2.3.2", "seedrandom": "^2.4.3" @@ -1861,6 +2029,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "license": "ISC", "engines": { "node": ">=10" } @@ -1869,6 +2038,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "license": "MIT", "engines": { "node": ">=6" } @@ -1878,6 +2048,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -1893,6 +2064,7 @@ "integrity": "sha512-Y8Hw+V3HgR7V71xWH2vQ9lyS358CbGCldWlJFR0JirqoGtOoas3R3/OclRTvgUYFK29mmJICDPauVKmpqbwhOA==", "deprecated": "https://about.codecov.io/blog/codecov-uploader-deprecation-plan/", "dev": true, + "license": "MIT", "dependencies": { "argv": "0.0.2", "ignore-walk": "3.0.4", @@ -1911,6 +2083,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", "dependencies": { "color-name": "1.1.3" } @@ -1918,13 +2091,15 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true, + "license": "ISC", "bin": { "color-support": "bin.js" } @@ -1934,6 +2109,7 @@ "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -1943,29 +2119,34 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "license": "MIT" }, "node_modules/console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1979,6 +2160,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", @@ -1995,6 +2177,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", @@ -2011,6 +2194,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -2027,6 +2211,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", + "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -2044,6 +2229,7 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2053,6 +2239,7 @@ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", "dev": true, + "license": "MIT", "dependencies": { "type-detect": "^4.0.0" }, @@ -2064,13 +2251,15 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/default-require-extensions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", "dev": true, + "license": "MIT", "dependencies": { "strip-bom": "^4.0.0" }, @@ -2085,6 +2274,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -2101,6 +2291,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "license": "MIT", "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -2117,13 +2308,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2133,6 +2326,7 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=8" } @@ -2142,6 +2336,7 @@ "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz", "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==", "dev": true, + "license": "MIT", "dependencies": { "dequal": "^2.0.0" }, @@ -2155,6 +2350,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -2164,6 +2360,7 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -2175,6 +2372,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -2187,29 +2385,34 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.76", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.76.tgz", - "integrity": "sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==", - "dev": true + "version": "1.5.87", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.87.tgz", + "integrity": "sha512-mPFwmEWmRivw2F8x3w3l2m6htAUN97Gy0kwpO++2m9iT1Gt8RCFVUfv9U/sIbHJ6rY4P6/ooqFL/eL7ock+pPg==", + "dev": true, + "license": "ISC" }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/emoji-regex-xs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz", "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/encoding": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "license": "MIT", "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -2220,6 +2423,7 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -2231,6 +2435,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "license": "MIT", "engines": { "node": ">=6" } @@ -2238,20 +2443,23 @@ "node_modules/err-code": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" + "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", + "license": "MIT" }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } }, "node_modules/es-abstract": { - "version": "1.23.8", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.8.tgz", - "integrity": "sha512-lfab8IzDn6EpI1ibZakcgS6WsfEBiB+43cuJo+wgylx1xKXf+Sp+YR3vFuQwC/u3sxYwV8Cxe3B0DpVUu/WiJQ==", + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", + "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.2", "arraybuffer.prototype.slice": "^1.0.4", @@ -2264,10 +2472,11 @@ "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", - "es-set-tostringtag": "^2.0.3", + "es-set-tostringtag": "^2.1.0", "es-to-primitive": "^1.3.0", "function.prototype.name": "^1.1.8", - "get-intrinsic": "^1.2.6", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.0", "get-symbol-description": "^1.1.0", "globalthis": "^1.0.4", "gopd": "^1.2.0", @@ -2288,11 +2497,12 @@ "object-inspect": "^1.13.3", "object-keys": "^1.1.1", "object.assign": "^4.1.7", - "own-keys": "^1.0.0", + "own-keys": "^1.0.1", "regexp.prototype.flags": "^1.5.3", "safe-array-concat": "^1.1.3", "safe-push-apply": "^1.0.0", "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", "string.prototype.trim": "^1.2.10", "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", @@ -2314,6 +2524,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -2322,6 +2533,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -2331,6 +2543,7 @@ "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", @@ -2354,9 +2567,10 @@ } }, "node_modules/es-object-atoms": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", - "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -2365,13 +2579,15 @@ } }, "node_modules/es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.4", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -2382,6 +2598,7 @@ "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, + "license": "MIT", "dependencies": { "hasown": "^2.0.0" } @@ -2390,6 +2607,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "license": "MIT", "dependencies": { "is-callable": "^1.2.7", "is-date-object": "^1.0.5", @@ -2406,13 +2624,15 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2421,6 +2641,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -2431,6 +2652,7 @@ "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -2500,6 +2722,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "engines": { "node": ">=12.0.0" }, @@ -2529,6 +2752,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "peerDependencies": { "eslint": "^8.8.0", "eslint-plugin-react": "^7.28.0" @@ -2539,6 +2763,7 @@ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.13.0", @@ -2550,6 +2775,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } @@ -2559,6 +2785,7 @@ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz", "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^3.2.7" }, @@ -2576,6 +2803,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } @@ -2585,6 +2813,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz", "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==", "dev": true, + "license": "MIT", "dependencies": { "eslint-utils": "^2.0.0", "regexpp": "^3.0.0" @@ -2604,6 +2833,7 @@ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^1.1.0" }, @@ -2619,6 +2849,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=4" } @@ -2628,6 +2859,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz", "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==", "dev": true, + "license": "MIT", "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.8", @@ -2661,6 +2893,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } @@ -2670,6 +2903,7 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -2682,6 +2916,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -2691,6 +2926,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz", "integrity": "sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==", "dev": true, + "license": "MIT", "dependencies": { "builtins": "^5.0.1", "eslint-plugin-es": "^4.1.0", @@ -2716,6 +2952,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz", "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==", "dev": true, + "license": "ISC", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -2727,10 +2964,11 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.37.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.3.tgz", - "integrity": "sha512-DomWuTQPFYZwF/7c9W2fkKkStqZmBd3uugfqBYLdkZ3Hii23WzZuOLUskGxB8qkSKqftxEeGL1TB2kMhrce0jA==", + "version": "7.37.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz", + "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==", "dev": true, + "license": "MIT", "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", @@ -2763,6 +3001,7 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -2775,6 +3014,7 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, + "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -2792,6 +3032,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -2801,6 +3042,7 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -2817,6 +3059,7 @@ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^2.0.0" }, @@ -2835,6 +3078,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=10" } @@ -2844,6 +3088,7 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -2856,6 +3101,7 @@ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, + "license": "MIT", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -2865,6 +3111,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -2879,13 +3126,15 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -2902,6 +3151,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -2913,13 +3163,15 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -2932,6 +3184,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -2947,6 +3200,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2956,6 +3210,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -2968,6 +3223,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -2980,6 +3236,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -2992,6 +3249,7 @@ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -3009,6 +3267,7 @@ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, + "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -3022,6 +3281,7 @@ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -3034,6 +3294,7 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -3046,6 +3307,7 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -3055,6 +3317,7 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } @@ -3062,25 +3325,28 @@ "node_modules/exponential-backoff": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" + "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "license": "Apache-2.0" }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "micromatch": "^4.0.8" }, "engines": { "node": ">=8.6.0" @@ -3091,6 +3357,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -3102,19 +3369,22 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-url-parser": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==", "dev": true, + "license": "MIT", "dependencies": { "punycode": "^1.3.2" } @@ -3123,13 +3393,15 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fastq": { "version": "1.18.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz", "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==", "dev": true, + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } @@ -3139,6 +3411,7 @@ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, + "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" }, @@ -3149,13 +3422,15 @@ "node_modules/file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==" + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "license": "MIT" }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -3168,6 +3443,7 @@ "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", "dev": true, + "license": "MIT", "dependencies": { "commondir": "^1.0.1", "make-dir": "^3.0.2", @@ -3185,6 +3461,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -3201,6 +3478,7 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -3210,6 +3488,7 @@ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, + "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -3223,12 +3502,14 @@ "version": "3.3.2", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz", "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "license": "MIT", "dependencies": { "is-callable": "^1.1.3" } @@ -3238,6 +3519,7 @@ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", "dev": true, + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^3.0.2" @@ -3264,12 +3546,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/fs-minipass": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -3281,7 +3565,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", @@ -3289,6 +3574,7 @@ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -3301,6 +3587,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3309,6 +3596,7 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", @@ -3328,6 +3616,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3338,6 +3627,7 @@ "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", "deprecated": "This package is no longer supported.", "dev": true, + "license": "ISC", "dependencies": { "aproba": "^1.0.3 || ^2.0.0", "color-support": "^1.1.2", @@ -3358,6 +3648,7 @@ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -3367,6 +3658,7 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -3376,25 +3668,27 @@ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } }, "node_modules/get-intrinsic": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz", - "integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", - "dunder-proto": "^1.0.0", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", + "get-proto": "^1.0.0", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", - "math-intrinsics": "^1.0.0" + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -3408,15 +3702,30 @@ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.0.0" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-stdin": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -3428,6 +3737,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", @@ -3446,6 +3756,7 @@ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -3465,6 +3776,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -3477,6 +3789,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -3486,6 +3799,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3498,6 +3812,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -3509,6 +3824,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "license": "MIT", "dependencies": { "define-properties": "^1.2.1", "gopd": "^1.0.1" @@ -3524,6 +3840,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3534,18 +3851,21 @@ "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "license": "ISC" }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3557,6 +3877,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", "engines": { "node": ">=4" } @@ -3565,6 +3886,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -3576,6 +3898,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "license": "MIT", "dependencies": { "dunder-proto": "^1.0.0" }, @@ -3590,6 +3913,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3601,6 +3925,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -3615,13 +3940,15 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/hasha": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", "dev": true, + "license": "MIT", "dependencies": { "is-stream": "^2.0.0", "type-fest": "^0.8.0" @@ -3637,6 +3964,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -3649,6 +3977,7 @@ "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.4.tgz", "integrity": "sha512-wxQzXtdbhiwGAUKrnQJXlOPmHnEehzphwkK7aluUPQ+lEc1xefC8pblMgpp2w5ldBTEfveRIrADcrhGIWrlTDA==", "dev": true, + "license": "MIT", "dependencies": { "@types/hast": "^3.0.0", "@types/unist": "^3.0.0", @@ -3672,6 +4001,7 @@ "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz", "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==", "dev": true, + "license": "MIT", "dependencies": { "@types/hast": "^3.0.0" }, @@ -3685,6 +4015,7 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, + "license": "MIT", "bin": { "he": "bin/he" } @@ -3692,19 +4023,22 @@ "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "license": "ISC" }, "node_modules/html-escaper": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/html-void-elements": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz", "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -3713,12 +4047,14 @@ "node_modules/http-cache-semantics": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", + "license": "BSD-2-Clause" }, "node_modules/http-proxy-agent": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "license": "MIT", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -3731,6 +4067,7 @@ "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "license": "MIT", "engines": { "node": ">= 14" } @@ -3740,6 +4077,7 @@ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "6", "debug": "4" @@ -3753,6 +4091,7 @@ "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, + "license": "MIT", "bin": { "husky": "bin.js" }, @@ -3767,6 +4106,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "license": "MIT", "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -3780,6 +4120,7 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } @@ -3789,6 +4130,7 @@ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==", "dev": true, + "license": "ISC", "dependencies": { "minimatch": "^3.0.4" } @@ -3798,6 +4140,7 @@ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -3813,6 +4156,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -3821,6 +4165,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -3831,6 +4176,7 @@ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -3840,12 +4186,14 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/internal-slot": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "hasown": "^2.0.2", @@ -3859,6 +4207,7 @@ "version": "9.0.5", "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "license": "MIT", "dependencies": { "jsbn": "1.1.0", "sprintf-js": "^1.1.3" @@ -3870,12 +4219,14 @@ "node_modules/ip-address/node_modules/sprintf-js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", + "license": "BSD-3-Clause" }, "node_modules/is-array-buffer": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", @@ -3891,14 +4242,20 @@ "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "license": "MIT" }, "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -3911,6 +4268,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "license": "MIT", "dependencies": { "has-bigints": "^1.0.2" }, @@ -3926,6 +4284,7 @@ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -3937,6 +4296,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz", "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "has-tostringtag": "^1.0.2" @@ -3952,6 +4312,7 @@ "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3963,6 +4324,7 @@ "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -3977,6 +4339,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "get-intrinsic": "^1.2.6", @@ -3993,6 +4356,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "has-tostringtag": "^1.0.2" @@ -4009,6 +4373,7 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4017,6 +4382,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3" }, @@ -4031,16 +4397,21 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", + "license": "MIT", "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -4054,6 +4425,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -4064,12 +4436,14 @@ "node_modules/is-lambda": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==" + "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", + "license": "MIT" }, "node_modules/is-map": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4082,6 +4456,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -4090,6 +4465,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" @@ -4106,6 +4482,7 @@ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4115,6 +4492,7 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4123,6 +4501,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "gopd": "^1.2.0", @@ -4140,6 +4519,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4151,6 +4531,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3" }, @@ -4166,6 +4547,7 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -4177,6 +4559,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" @@ -4192,6 +4575,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "has-symbols": "^1.1.0", @@ -4208,6 +4592,7 @@ "version": "1.1.15", "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "license": "MIT", "dependencies": { "which-typed-array": "^1.1.16" }, @@ -4222,13 +4607,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -4240,6 +4627,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4251,6 +4639,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz", "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2" }, @@ -4265,6 +4654,7 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "get-intrinsic": "^1.2.6" @@ -4281,6 +4671,7 @@ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4288,18 +4679,21 @@ "node_modules/isarray": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "license": "MIT" }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "license": "ISC" }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=8" } @@ -4309,6 +4703,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "append-transform": "^2.0.0" }, @@ -4321,6 +4716,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "@babel/core": "^7.7.5", "@istanbuljs/schema": "^0.1.2", @@ -4336,6 +4732,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -4345,6 +4742,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz", "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==", "dev": true, + "license": "ISC", "dependencies": { "archy": "^1.0.0", "cross-spawn": "^7.0.3", @@ -4362,6 +4760,7 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", "dev": true, + "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -4374,6 +4773,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", @@ -4388,6 +4788,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4397,6 +4798,7 @@ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -4412,6 +4814,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -4424,6 +4827,7 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0", @@ -4438,6 +4842,7 @@ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -4447,16 +4852,17 @@ } }, "node_modules/iterator.prototype": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.4.tgz", - "integrity": "sha512-x4WH0BWmrMmg4oHHl+duwubhrvczGlyuGAZu3nvrf0UXOfPu8IhZObFEr7DE/iv01YgVZrsOiRcqw2srkKEDIA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", "dev": true, + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-object-atoms": "^1.0.0", "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", "has-symbols": "^1.1.0", - "reflect.getprototypeof": "^1.0.8", "set-function-name": "^2.0.2" }, "engines": { @@ -4467,6 +4873,7 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -4481,13 +4888,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/js-yaml": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -4499,13 +4908,15 @@ "node_modules/jsbn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", + "license": "MIT" }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -4517,30 +4928,35 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -4553,6 +4969,7 @@ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", "dev": true, + "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.flat": "^1.3.1", @@ -4568,6 +4985,7 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } @@ -4577,6 +4995,7 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -4590,6 +5009,7 @@ "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dev": true, + "license": "MIT", "dependencies": { "uc.micro": "^2.0.0" } @@ -4598,6 +5018,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", + "license": "MIT", "dependencies": { "graceful-fs": "^4.1.2", "parse-json": "^4.0.0", @@ -4612,6 +5033,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "license": "MIT", "engines": { "node": ">=4" } @@ -4621,6 +5043,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -4635,19 +5058,22 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -4664,6 +5090,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -4679,6 +5106,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -4695,6 +5123,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -4706,13 +5135,15 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/log-symbols/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4722,6 +5153,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -4734,6 +5166,7 @@ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dev": true, + "license": "MIT", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -4746,6 +5179,7 @@ "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, + "license": "MIT", "dependencies": { "get-func-name": "^2.0.1" } @@ -4753,19 +5187,22 @@ "node_modules/lru-cache": { "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "license": "ISC" }, "node_modules/lunr": { "version": "2.3.9", "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^6.0.0" }, @@ -4781,6 +5218,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } @@ -4789,6 +5227,7 @@ "version": "13.0.1", "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "license": "ISC", "dependencies": { "@npmcli/agent": "^2.0.0", "cacache": "^18.0.0", @@ -4812,6 +5251,7 @@ "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1", "entities": "^4.4.0", @@ -4828,12 +5268,14 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -4843,6 +5285,7 @@ "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz", "integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==", "dev": true, + "license": "MIT", "dependencies": { "@types/hast": "^3.0.0", "@types/mdast": "^4.0.0", @@ -4863,7 +5306,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/memorystream": { "version": "0.3.1", @@ -4878,6 +5322,7 @@ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -4897,6 +5342,7 @@ "url": "https://opencollective.com/unified" } ], + "license": "MIT", "dependencies": { "micromark-util-symbol": "^2.0.0", "micromark-util-types": "^2.0.0" @@ -4916,7 +5362,8 @@ "type": "OpenCollective", "url": "https://opencollective.com/unified" } - ] + ], + "license": "MIT" }, "node_modules/micromark-util-sanitize-uri": { "version": "2.0.1", @@ -4933,6 +5380,7 @@ "url": "https://opencollective.com/unified" } ], + "license": "MIT", "dependencies": { "micromark-util-character": "^2.0.0", "micromark-util-encode": "^2.0.0", @@ -4953,7 +5401,8 @@ "type": "OpenCollective", "url": "https://opencollective.com/unified" } - ] + ], + "license": "MIT" }, "node_modules/micromark-util-types": { "version": "2.0.1", @@ -4969,13 +5418,15 @@ "type": "OpenCollective", "url": "https://opencollective.com/unified" } - ] + ], + "license": "MIT" }, "node_modules/micromatch": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -4988,6 +5439,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5000,6 +5452,7 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5008,6 +5461,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } @@ -5016,6 +5470,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -5027,6 +5482,7 @@ "version": "3.0.5", "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "license": "MIT", "dependencies": { "minipass": "^7.0.3", "minipass-sized": "^1.0.3", @@ -5043,6 +5499,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -5054,6 +5511,7 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -5065,6 +5523,7 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -5076,6 +5535,7 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -5087,6 +5547,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -5098,6 +5559,7 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -5109,6 +5571,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "license": "MIT", "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -5121,6 +5584,7 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -5132,6 +5596,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" }, @@ -5144,6 +5609,7 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", @@ -5178,19 +5644,22 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/mocha-clean/-/mocha-clean-1.0.0.tgz", "integrity": "sha512-1GFhy+5nkz6lle/fpoTvgiXnObhpzy7VZYkg+zfmHf2Dewu99uCJ6ycVXa5UjFlhMBGE0CvdIot9yifb85g2gw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mocha/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/mocha/node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -5200,6 +5669,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -5211,6 +5681,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -5223,6 +5694,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5232,6 +5704,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -5244,6 +5717,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -5256,6 +5730,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -5271,6 +5746,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -5287,23 +5763,27 @@ "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/nan": { "version": "2.22.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", - "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==" + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "license": "MIT" }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -5311,13 +5791,15 @@ "node_modules/nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "license": "MIT" }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -5337,6 +5819,7 @@ "version": "10.3.1", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz", "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==", + "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", @@ -5360,6 +5843,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -5368,6 +5852,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -5376,6 +5861,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -5391,6 +5877,7 @@ "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", @@ -5410,6 +5897,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "license": "ISC", "engines": { "node": ">=16" } @@ -5418,6 +5906,7 @@ "version": "9.0.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -5432,6 +5921,7 @@ "version": "7.2.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "license": "ISC", "dependencies": { "abbrev": "^2.0.0" }, @@ -5446,6 +5936,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "license": "ISC", "engines": { "node": ">=14" }, @@ -5457,6 +5948,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "license": "ISC", "dependencies": { "isexe": "^3.1.1" }, @@ -5472,6 +5964,7 @@ "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", "dev": true, + "license": "MIT", "dependencies": { "process-on-spawn": "^1.0.0" }, @@ -5483,13 +5976,15 @@ "version": "2.0.19", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", "dev": true, + "license": "ISC", "dependencies": { "abbrev": "1" }, @@ -5504,6 +5999,7 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "license": "BSD-2-Clause", "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -5515,6 +6011,7 @@ "version": "5.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -5524,6 +6021,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5532,6 +6030,7 @@ "version": "4.1.5", "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz", "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "chalk": "^2.4.1", @@ -5556,6 +6055,7 @@ "version": "6.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", + "license": "MIT", "dependencies": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -5571,6 +6071,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "license": "MIT", "engines": { "node": ">=4" } @@ -5579,6 +6080,7 @@ "version": "5.7.2", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -5587,6 +6089,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "license": "MIT", "dependencies": { "shebang-regex": "^1.0.0" }, @@ -5598,6 +6101,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5606,6 +6110,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -5619,6 +6124,7 @@ "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", "deprecated": "This package is no longer supported.", "dev": true, + "license": "ISC", "dependencies": { "are-we-there-yet": "^2.0.0", "console-control-strings": "^1.1.0", @@ -5631,6 +6137,7 @@ "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", "dev": true, + "license": "ISC", "dependencies": { "@istanbuljs/load-nyc-config": "^1.0.0", "@istanbuljs/schema": "^0.1.2", @@ -5672,6 +6179,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -5687,6 +6195,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -5698,6 +6207,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -5709,13 +6219,15 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/nyc/node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -5730,6 +6242,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5750,6 +6263,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -5762,6 +6276,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -5777,6 +6292,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -5789,6 +6305,7 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", "dev": true, + "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -5801,6 +6318,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5810,6 +6328,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -5823,13 +6342,15 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/nyc/node_modules/yargs": { "version": "15.4.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", @@ -5852,6 +6373,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, + "license": "ISC", "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -5865,6 +6387,7 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5873,6 +6396,7 @@ "version": "1.13.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5884,6 +6408,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -5892,6 +6417,7 @@ "version": "4.1.7", "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", @@ -5912,6 +6438,7 @@ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -5926,6 +6453,7 @@ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -5944,6 +6472,7 @@ "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -5958,6 +6487,7 @@ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", @@ -5976,19 +6506,21 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } }, "node_modules/oniguruma-to-es": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-0.8.1.tgz", - "integrity": "sha512-dekySTEvCxCj0IgKcA2uUCO/e4ArsqpucDPcX26w9ajx+DvMWLc5eZeJaRQkd7oC/+rwif5gnT900tA34uN9Zw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-2.3.0.tgz", + "integrity": "sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex-xs": "^1.0.0", - "regex": "^5.0.2", - "regex-recursion": "^5.0.0" + "regex": "^5.1.1", + "regex-recursion": "^5.1.1" } }, "node_modules/optionator": { @@ -5996,6 +6528,7 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, + "license": "MIT", "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -6012,6 +6545,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.6", "object-keys": "^1.1.1", @@ -6029,6 +6563,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -6044,6 +6579,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -6058,6 +6594,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -6073,6 +6610,7 @@ "resolved": "https://registry.npmjs.org/p-throttle/-/p-throttle-3.1.0.tgz", "integrity": "sha512-rLo81NXBihs3GJQhq89IXa0Egj/sbW1zW8/qnyadOwUhIUrZSUvyGdQ46ISRKELFBkVvmMJ4JUqWki4oAh30Qw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -6082,6 +6620,7 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -6091,6 +6630,7 @@ "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", "dev": true, + "license": "ISC", "dependencies": { "graceful-fs": "^4.1.15", "hasha": "^5.0.0", @@ -6104,13 +6644,15 @@ "node_modules/package-json-from-dist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "license": "BlueOak-1.0.0" }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -6122,6 +6664,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", + "license": "MIT", "dependencies": { "error-ex": "^1.3.1", "json-parse-better-errors": "^1.0.1" @@ -6135,6 +6678,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -6144,6 +6688,7 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -6152,6 +6697,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", "engines": { "node": ">=8" } @@ -6159,12 +6705,14 @@ "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" }, "node_modules/path-scurry": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -6180,6 +6728,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "license": "MIT", "dependencies": { "pify": "^3.0.0" }, @@ -6192,6 +6741,7 @@ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } @@ -6200,13 +6750,15 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -6218,6 +6770,7 @@ "version": "0.3.1", "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz", "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==", + "license": "MIT", "bin": { "pidtree": "bin/pidtree.js" }, @@ -6229,6 +6782,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", + "license": "MIT", "engines": { "node": ">=4" } @@ -6238,6 +6792,7 @@ "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-3.1.0.tgz", "integrity": "sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^3.0.0", "load-json-file": "^5.2.0" @@ -6251,6 +6806,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^3.0.0" }, @@ -6263,6 +6819,7 @@ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-5.3.0.tgz", "integrity": "sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.1.15", "parse-json": "^4.0.0", @@ -6279,6 +6836,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -6292,6 +6850,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -6307,6 +6866,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.0.0" }, @@ -6319,6 +6879,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -6328,6 +6889,7 @@ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -6337,6 +6899,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -6346,6 +6909,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=6" } @@ -6355,6 +6919,7 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^4.0.0" }, @@ -6367,6 +6932,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -6380,6 +6946,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -6392,6 +6959,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -6407,6 +6975,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -6418,6 +6987,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -6427,6 +6997,7 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } @@ -6435,6 +7006,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } @@ -6444,6 +7016,7 @@ "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz", "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==", "dev": true, + "license": "MIT", "dependencies": { "fromentries": "^1.2.0" }, @@ -6455,6 +7028,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", + "license": "MIT", "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -6468,6 +7042,7 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "dev": true, + "license": "MIT", "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -6479,6 +7054,7 @@ "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz", "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -6489,6 +7065,7 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -6498,6 +7075,7 @@ "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -6520,13 +7098,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -6535,12 +7115,14 @@ "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", + "license": "MIT", "dependencies": { "load-json-file": "^4.0.0", "normalize-package-data": "^2.3.2", @@ -6555,6 +7137,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -6569,6 +7152,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -6577,17 +7161,18 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.9.tgz", - "integrity": "sha512-r0Ay04Snci87djAsI4U+WNRcSw5S4pOH7qFjd/veA5gC7TbqESR3tcj28ia95L/fYUDw11JKP7uqUKUAfVvV5Q==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "dunder-proto": "^1.0.1", - "es-abstract": "^1.23.6", + "es-abstract": "^1.23.9", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.6", - "gopd": "^1.2.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", "which-builtin-type": "^1.2.1" }, "engines": { @@ -6602,6 +7187,7 @@ "resolved": "https://registry.npmjs.org/regex/-/regex-5.1.1.tgz", "integrity": "sha512-dN5I359AVGPnwzJm2jN1k0W9LPZ+ePvoOeVMMfqIMFz53sSwXkxaJoxr50ptnsC771lK95BnTrVSZxq0b9yCGw==", "dev": true, + "license": "MIT", "dependencies": { "regex-utilities": "^2.3.0" } @@ -6611,6 +7197,7 @@ "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-5.1.1.tgz", "integrity": "sha512-ae7SBCbzVNrIjgSbh7wMznPcQel1DNlDtzensnFxpiNpXt1U2ju/bHugH422r+4LAVS1FpW1YCwilmnNsjum9w==", "dev": true, + "license": "MIT", "dependencies": { "regex": "^5.1.1", "regex-utilities": "^2.3.0" @@ -6620,16 +7207,20 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz", "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/regexp.prototype.flags": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", - "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", "set-function-name": "^2.0.2" }, "engines": { @@ -6644,6 +7235,7 @@ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -6656,6 +7248,7 @@ "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==", "dev": true, + "license": "ISC", "dependencies": { "es6-error": "^4.0.1" }, @@ -6668,6 +7261,7 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -6676,12 +7270,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/resolve": { "version": "1.22.10", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", "dependencies": { "is-core-module": "^2.16.0", "path-parse": "^1.0.7", @@ -6702,6 +7298,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -6710,6 +7307,7 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -6719,6 +7317,7 @@ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -6730,6 +7329,7 @@ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -6746,6 +7346,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -6780,6 +7381,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } @@ -6788,6 +7390,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", @@ -6820,12 +7423,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safe-push-apply": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "isarray": "^2.0.5" @@ -6841,6 +7446,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -6857,18 +7463,21 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT", "optional": true }, "node_modules/seedrandom": { "version": "2.4.4", "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-2.4.4.tgz", "integrity": "sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/semver": { "version": "7.6.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -6881,6 +7490,7 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -6889,12 +7499,14 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -6911,6 +7523,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -6921,10 +7534,25 @@ "node": ">= 0.4" } }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -6936,6 +7564,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "license": "MIT", "engines": { "node": ">=8" } @@ -6944,6 +7573,7 @@ "version": "1.8.2", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz", "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6952,16 +7582,19 @@ } }, "node_modules/shiki": { - "version": "1.24.4", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.24.4.tgz", - "integrity": "sha512-aVGSFAOAr1v26Hh/+GBIsRVDWJ583XYV7CuNURKRWh9gpGv4OdbisZGq96B9arMYTZhTQkmRF5BrShOSTvNqhw==", - "dev": true, - "dependencies": { - "@shikijs/core": "1.24.4", - "@shikijs/engine-javascript": "1.24.4", - "@shikijs/engine-oniguruma": "1.24.4", - "@shikijs/types": "1.24.4", - "@shikijs/vscode-textmate": "^9.3.1", + "version": "1.29.1", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.29.1.tgz", + "integrity": "sha512-TghWKV9pJTd/N+IgAIVJtr0qZkB7FfFCUrrEJc0aRmZupo3D1OCVRknQWVRVA7AX/M0Ld7QfoAruPzr3CnUJuw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@shikijs/core": "1.29.1", + "@shikijs/engine-javascript": "1.29.1", + "@shikijs/engine-oniguruma": "1.29.1", + "@shikijs/langs": "1.29.1", + "@shikijs/themes": "1.29.1", + "@shikijs/types": "1.29.1", + "@shikijs/vscode-textmate": "^10.0.1", "@types/hast": "^3.0.4" } }, @@ -6969,6 +7602,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", @@ -6987,6 +7621,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" @@ -7002,6 +7637,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -7019,6 +7655,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -7037,12 +7674,14 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "license": "MIT", "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" @@ -7052,6 +7691,7 @@ "version": "2.8.3", "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "license": "MIT", "dependencies": { "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" @@ -7065,6 +7705,7 @@ "version": "8.0.5", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", + "license": "MIT", "dependencies": { "agent-base": "^7.1.2", "debug": "^4.3.4", @@ -7078,6 +7719,7 @@ "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", + "license": "MIT", "engines": { "node": ">= 14" } @@ -7087,6 +7729,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -7096,6 +7739,7 @@ "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -7106,6 +7750,7 @@ "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", "dev": true, + "license": "ISC", "dependencies": { "foreground-child": "^2.0.0", "is-windows": "^1.0.2", @@ -7122,6 +7767,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", + "license": "Apache-2.0", "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -7130,32 +7776,37 @@ "node_modules/spdx-exceptions": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==" + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "node_modules/spdx-license-ids": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", - "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==" + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "license": "CC0-1.0" }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/ssri": { "version": "10.0.6", "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "license": "ISC", "dependencies": { "minipass": "^7.0.3" }, @@ -7182,6 +7833,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "eslint": "^8.41.0", "eslint-config-standard": "17.1.0", @@ -7219,6 +7871,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "get-stdin": "^8.0.0", "minimist": "^1.2.6", @@ -7234,6 +7887,7 @@ "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==", "dev": true, + "license": "MIT", "dependencies": { "stubs": "^3.0.0" } @@ -7243,6 +7897,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -7251,6 +7906,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -7265,6 +7921,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -7279,6 +7936,7 @@ "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.3", @@ -7305,6 +7963,7 @@ "version": "3.1.6", "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz", "integrity": "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -7323,6 +7982,7 @@ "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", "dev": true, + "license": "MIT", "dependencies": { "define-properties": "^1.1.3", "es-abstract": "^1.17.5" @@ -7332,6 +7992,7 @@ "version": "1.2.10", "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", @@ -7352,6 +8013,7 @@ "version": "1.0.9", "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", @@ -7369,6 +8031,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", @@ -7386,6 +8049,7 @@ "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz", "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==", "dev": true, + "license": "MIT", "dependencies": { "character-entities-html4": "^2.0.0", "character-entities-legacy": "^3.0.0" @@ -7399,6 +8063,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -7411,6 +8076,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -7423,6 +8089,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -7432,6 +8099,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -7443,12 +8111,14 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz", "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -7460,6 +8130,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -7471,6 +8142,7 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "license": "ISC", "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -7487,6 +8159,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", "dependencies": { "minipass": "^3.0.0" }, @@ -7498,6 +8171,7 @@ "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -7509,6 +8183,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", "engines": { "node": ">=8" } @@ -7518,6 +8193,7 @@ "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz", "integrity": "sha512-iwY6rkW5DDGq8hE2YgNQlKbptYpY5Nn2xecjQiNjOXWbKzPGUfmeUBCSQbbr306d7Z7U2N0TPl+/SwYRfua1Dg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "http-proxy-agent": "^4.0.0", "https-proxy-agent": "^5.0.0", @@ -7534,6 +8210,7 @@ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, + "license": "MIT", "dependencies": { "@tootallnate/once": "1", "agent-base": "6", @@ -7548,6 +8225,7 @@ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, + "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -7563,6 +8241,7 @@ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -7582,13 +8261,15 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/tmp": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", "dev": true, + "license": "MIT", "engines": { "node": ">=14.14" } @@ -7598,6 +8279,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -7609,28 +8291,31 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/trim-lines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" } }, "node_modules/ts-api-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", - "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz", + "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==", "dev": true, + "license": "MIT", "engines": { - "node": ">=16" + "node": ">=18.12" }, "peerDependencies": { - "typescript": ">=4.2.0" + "typescript": ">=4.8.4" } }, "node_modules/tsconfig-paths": { @@ -7638,6 +8323,7 @@ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", @@ -7650,6 +8336,7 @@ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.0" }, @@ -7662,6 +8349,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -7671,6 +8359,7 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -7683,6 +8372,7 @@ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -7692,6 +8382,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=8" } @@ -7700,6 +8391,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", @@ -7713,6 +8405,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.8", "for-each": "^0.3.3", @@ -7731,6 +8424,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", @@ -7751,6 +8445,7 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", @@ -7771,6 +8466,7 @@ "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", "dev": true, + "license": "MIT", "dependencies": { "is-typedarray": "^1.0.0" } @@ -7780,6 +8476,7 @@ "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.11.tgz", "integrity": "sha512-sFEgRRtrcDl2FxVP58Ze++ZK2UQAEvtvvH8rRlig1Ja3o7dDaMHmaBfvJmdGnNEFaLTpQsN8dpvZaTqJSu/Ugw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "lunr": "^2.3.9", "markdown-it": "^14.1.0", @@ -7802,6 +8499,7 @@ "resolved": "https://registry.npmjs.org/typedoc-plugin-rename-defaults/-/typedoc-plugin-rename-defaults-0.7.2.tgz", "integrity": "sha512-9oa1CsMN4p/xuVR2JW2YDD6xE7JcrIth3KAfjR8YBi6NnrDk2Q72o4lbArybLDjxKAkOzk7N1uUdGwJlooLEOg==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^8.0.0" }, @@ -7814,6 +8512,7 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz", "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==", "dev": true, + "license": "MIT", "engines": { "node": ">=16" }, @@ -7826,6 +8525,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -7835,6 +8535,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -7850,6 +8551,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7859,14 +8561,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.19.0.tgz", - "integrity": "sha512-Ni8sUkVWYK4KAcTtPjQ/UTiRk6jcsuDhPpxULapUDi8A/l8TSBk+t1GtJA1RsCzIJg0q6+J7bf35AwQigENWRQ==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.21.0.tgz", + "integrity": "sha512-txEKYY4XMKwPXxNkN8+AxAdX6iIJAPiJbHE/FpQccs/sxw8Lf26kqwC3cn0xkHlW8kEbLhkhCsjWuMveaY9Rxw==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.19.0", - "@typescript-eslint/parser": "8.19.0", - "@typescript-eslint/utils": "8.19.0" + "@typescript-eslint/eslint-plugin": "8.21.0", + "@typescript-eslint/parser": "8.21.0", + "@typescript-eslint/utils": "8.21.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7884,12 +8587,14 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/unbox-primitive": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.3", "has-bigints": "^1.0.2", @@ -7907,12 +8612,14 @@ "version": "6.20.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/unique-filename": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "license": "ISC", "dependencies": { "unique-slug": "^4.0.0" }, @@ -7924,6 +8631,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4" }, @@ -7936,6 +8644,7 @@ "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" }, @@ -7949,6 +8658,7 @@ "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" }, @@ -7962,6 +8672,7 @@ "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" }, @@ -7975,6 +8686,7 @@ "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz", "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", "unist-util-is": "^6.0.0", @@ -7990,6 +8702,7 @@ "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", "unist-util-is": "^6.0.0" @@ -8000,9 +8713,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", - "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", + "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", "dev": true, "funding": [ { @@ -8018,9 +8731,10 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "escalade": "^3.2.0", - "picocolors": "^1.1.0" + "picocolors": "^1.1.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -8034,6 +8748,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } @@ -8043,27 +8758,24 @@ "resolved": "https://registry.npmjs.org/urlgrey/-/urlgrey-1.0.0.tgz", "integrity": "sha512-hJfIzMPJmI9IlLkby8QrsCykQ+SXDeO2W5Q9QTW3QpqZVTx4a/K7p8/5q+/isD8vsbVaFgql/gvAoQCRQ2Cb5w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "fast-url-parser": "^1.1.3" } }, - "node_modules/user": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/user/-/user-0.0.0.tgz", - "integrity": "sha512-eRNM5isOvr6aEFAGi1CqAkmLkYxW2NJ5ThhbD+6IJXYKM1mo7Gtxx4mQIveHz/5K3p/SVnlW9k17ETn+QAu8IQ==", - "license": "MIT" - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } @@ -8072,6 +8784,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "license": "Apache-2.0", "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -8082,6 +8795,7 @@ "resolved": "https://registry.npmjs.org/version-guard/-/version-guard-1.1.3.tgz", "integrity": "sha512-JwPr6erhX53EWH/HCSzfy1tTFrtPXUe927wdM1jqBBeYp1OM+qPHjWbsvv6pIBduqdgxxS+ScfG7S28pzyr2DQ==", "dev": true, + "license": "0BSD", "engines": { "node": ">=0.10.48" } @@ -8091,6 +8805,7 @@ "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", "vfile-message": "^4.0.0" @@ -8105,6 +8820,7 @@ "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", "unist-util-stringify-position": "^4.0.0" @@ -8118,13 +8834,15 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dev": true, + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -8134,6 +8852,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -8148,6 +8867,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "license": "MIT", "dependencies": { "is-bigint": "^1.1.0", "is-boolean-object": "^1.2.1", @@ -8166,6 +8886,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "function.prototype.name": "^1.1.6", @@ -8192,6 +8913,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "license": "MIT", "dependencies": { "is-map": "^2.0.3", "is-set": "^2.0.3", @@ -8209,12 +8931,14 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/which-typed-array": { "version": "1.1.18", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz", "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==", + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.8", @@ -8235,6 +8959,7 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^1.0.2 || 2 || 3 || 4" } @@ -8244,6 +8969,7 @@ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -8252,13 +8978,15 @@ "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -8276,6 +9004,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -8292,6 +9021,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -8306,6 +9036,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -8316,13 +9047,15 @@ "node_modules/wrap-ansi-cjs/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/wrap-ansi/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -8338,6 +9071,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -8349,19 +9083,22 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/write-file-atomic": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", "dev": true, + "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", @@ -8374,6 +9111,7 @@ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -8383,6 +9121,7 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -8390,13 +9129,15 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" }, "node_modules/yaml": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", - "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", "dev": true, + "license": "ISC", "bin": { "yaml": "bin.mjs" }, @@ -8409,6 +9150,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -8427,6 +9169,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -8436,6 +9179,7 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -8451,6 +9195,7 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -8463,6 +9208,7 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -8475,6 +9221,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, + "license": "ISC", "engines": { "node": ">=12" } @@ -8484,6 +9231,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -8496,6 +9244,7 @@ "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz", "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" diff --git a/package.json b/package.json index 998fe47c4..b9e36ad25 100644 --- a/package.json +++ b/package.json @@ -63,8 +63,7 @@ "minimatch": "^3.1.2", "nan": "^2.22.0", "node-gyp": "^10.1.0", - "npm-run-all": "^4.1.5", - "user": "^0.0.0" + "npm-run-all": "^4.1.5" }, "devDependencies": { "@eslint/js": "^9.12.0", From b3b16d7ed93ef32d7c8dd471b9dc9a2e2e62ffd9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:39:26 -0700 Subject: [PATCH 360/417] CI/CD enginerring --- .github/workflows/run-npm-install.yml | 5 ++++- .github/workflows/verify-npm-install.yml | 10 +++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-npm-install.yml b/.github/workflows/run-npm-install.yml index 2db2a5e0c..cf6cce64c 100644 --- a/.github/workflows/run-npm-install.yml +++ b/.github/workflows/run-npm-install.yml @@ -35,7 +35,7 @@ jobs: # Bash >= 4 supports hashmaps shell: bash - verify-npm-install: + run-npm-install-and-require-test: needs: get-runner-os strategy: matrix: @@ -43,6 +43,9 @@ jobs: fail-fast: false runs-on: ${{ needs.get-runner-os.outputs.runner-os }} steps: + - name: Checkout repository + uses: actions/checkout@v3 + - uses: actions/setup-node@v4 with: node-version: ${{ matrix.nodejs-tag[1] }} diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index e995497e0..054f0c2cc 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -18,11 +18,7 @@ jobs: "macosx_arm64", "win_amd64" ] - steps: - - name: Checkout repository - uses: actions/checkout@v3 + uses: ./.github/workflows/run-npm-install.yml + with: + platform-tag: "${{ matrix.platform-tag }}" - - name: Verify npm install - uses: ./.github/workflows/run-npm-install.yml - with: - platform-tag: "${{ matrix.platform-tag }}" \ No newline at end of file From 2efcdef3afb69b5c917f9e8137287e45a7e996d5 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:43:25 -0700 Subject: [PATCH 361/417] CI/CD enginerring --- .github/workflows/run-npm-install.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-npm-install.yml b/.github/workflows/run-npm-install.yml index cf6cce64c..c578f83ec 100644 --- a/.github/workflows/run-npm-install.yml +++ b/.github/workflows/run-npm-install.yml @@ -1,14 +1,16 @@ name: 'Donwload github artifacts' description: 'Download github artifacts for all supported versions' -inputs: - nodejs-tags: - type: string - required: false - default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' - platform-tag: - type: string - required: true +on: + workflow_dispatch: + inputs: + nodejs-tags: + type: string + required: false + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' + platform-tag: + type: string + required: true jobs: From 2a2b36723ecdac42583c9cf72769f93a5c57a9b8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:45:39 -0700 Subject: [PATCH 362/417] CI/CD enginerring --- .github/workflows/run-npm-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-npm-install.yml b/.github/workflows/run-npm-install.yml index c578f83ec..e8c812263 100644 --- a/.github/workflows/run-npm-install.yml +++ b/.github/workflows/run-npm-install.yml @@ -2,7 +2,7 @@ name: 'Donwload github artifacts' description: 'Download github artifacts for all supported versions' on: - workflow_dispatch: + workflow_call: inputs: nodejs-tags: type: string From 092e16801888e431c115bcc0e9b5b439e4b1320c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:48:41 -0700 Subject: [PATCH 363/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 054f0c2cc..ab6eb36fd 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -18,7 +18,12 @@ jobs: "macosx_arm64", "win_amd64" ] - uses: ./.github/workflows/run-npm-install.yml - with: - platform-tag: "${{ matrix.platform-tag }}" + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Run reusable workflow + uses: ./.github/workflows/run-npm-install.yml + with: + platform-tag: "${{ matrix.platform-tag }}" From f22e0abf06b305a309a62935a1aa2d8b415743b8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:49:54 -0700 Subject: [PATCH 364/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index ab6eb36fd..b47888c95 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -22,6 +22,8 @@ jobs: - name: Checkout code uses: actions/checkout@v3 + - name: ls ./github/workflows + - run: ls ./.github/workflows - name: Run reusable workflow uses: ./.github/workflows/run-npm-install.yml with: From 5e557a86b68084dbb4eedb488b0086f3ff8d3687 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:50:05 -0700 Subject: [PATCH 365/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index b47888c95..ad44a6a0d 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -23,7 +23,8 @@ jobs: uses: actions/checkout@v3 - name: ls ./github/workflows - - run: ls ./.github/workflows + run: ls ./.github/workflows + - name: Run reusable workflow uses: ./.github/workflows/run-npm-install.yml with: From c8583e826ec0fd088e700e79568e492115cbae0c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:55:47 -0700 Subject: [PATCH 366/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index ad44a6a0d..575737d18 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -6,7 +6,6 @@ on: jobs: verify: - runs-on: ubuntu-latest strategy: matrix: platform-tag: [ @@ -18,15 +17,9 @@ jobs: "macosx_arm64", "win_amd64" ] - steps: - - name: Checkout code - uses: actions/checkout@v3 + runs-on: ubuntu-latest - - name: ls ./github/workflows - run: ls ./.github/workflows - - - name: Run reusable workflow - uses: ./.github/workflows/run-npm-install.yml - with: - platform-tag: "${{ matrix.platform-tag }}" + uses: ./.github/workflows/run-npm-install.yml + with: + platform-tag: "${{ matrix.platform-tag }}" From 94afd276f0b4e7a9f8b4cd35593d4a8dbf3564fa Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 08:57:33 -0700 Subject: [PATCH 367/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 575737d18..126d307cd 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -6,6 +6,7 @@ on: jobs: verify: + runs-on: ubuntu-latest strategy: matrix: platform-tag: [ @@ -17,9 +18,15 @@ jobs: "macosx_arm64", "win_amd64" ] - runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 - uses: ./.github/workflows/run-npm-install.yml - with: - platform-tag: "${{ matrix.platform-tag }}" + - name: ls ./github/workflows + run: ls ./.github/workflows + + - name: Run reusable workflow + uses: ./.github/workflows/run-npm-install.yml + with: + platform-tag: "${{ matrix.platform-tag }}" From 9b1f607fb5e394b673ff463111cdd2cacb86bd20 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:06:22 -0700 Subject: [PATCH 368/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 4 ++++ .github/workflows/run-npm-install.yml | 24 ------------------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index a87f159c2..7028aea09 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -73,6 +73,10 @@ jobs: # publish-to-npm #] uses: ./.github/workflows/verify-npm-install.yml + strategy: + matrix: + os: [ubuntu-22.04, 22.04A, 20.04, 20.04A, macos-13-large, SMA, windows-2022] + runs-on: ${{ matrix.os }} secrets: inherit diff --git a/.github/workflows/run-npm-install.yml b/.github/workflows/run-npm-install.yml index e8c812263..02e9090b9 100644 --- a/.github/workflows/run-npm-install.yml +++ b/.github/workflows/run-npm-install.yml @@ -14,36 +14,12 @@ on: jobs: - # Maps don't exist in Github Actions, so we have to store the map using a script and fetch it in a job - # This uses up more billing minutes (rounded up to 1 minute for each job run), - # but this should be ok based on the minutes usage data for the aerospike organization - get-runner-os: - outputs: - runner-os: ${{ steps.get-runner-os.outputs.runner_os }} - runs-on: ubuntu-22.04 - steps: - - id: get-runner-os - # Single source of truth for which runner OS to use for each platform tag - run: | - declare -A hashmap - hashmap[manylinux_x86_64]="ubuntu-22.04" - hashmap[manylinux_aarch64]="22.04A" - hashmap[manylinux_20_x86_64]="20.04" - hashmap[manylinux_20_aarch64]="20.04A" - hashmap[macosx_x86_64]="macos-13-large" - hashmap[macosx_arm64]="SMA" - hashmap[win_amd64]="windows-2022" - echo runner_os=${hashmap[${{ inputs.platform-tag }}]} >> $GITHUB_OUTPUT - # Bash >= 4 supports hashmaps - shell: bash - run-npm-install-and-require-test: needs: get-runner-os strategy: matrix: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} fail-fast: false - runs-on: ${{ needs.get-runner-os.outputs.runner-os }} steps: - name: Checkout repository uses: actions/checkout@v3 From c145c1b12a32ccc2384d0cce7114a5571bdbc490 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:07:22 -0700 Subject: [PATCH 369/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 42 +++++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 126d307cd..02e9090b9 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -1,32 +1,34 @@ -name: 'NPM Install Verify' -run-name: 'Verify NPM Install' +name: 'Donwload github artifacts' +description: 'Download github artifacts for all supported versions' on: workflow_call: + inputs: + nodejs-tags: + type: string + required: false + default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' + platform-tag: + type: string + required: true + jobs: - verify: - runs-on: ubuntu-latest + run-npm-install-and-require-test: + needs: get-runner-os strategy: matrix: - platform-tag: [ - "manylinux_x86_64", - "manylinux_aarch64", - "manylinux_20_x86_64", - "manylinux_20_aarch64", - "macosx_x86_64", - "macosx_arm64", - "win_amd64" - ] + nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} + fail-fast: false steps: - - name: Checkout code + - name: Checkout repository uses: actions/checkout@v3 - - name: ls ./github/workflows - run: ls ./.github/workflows - - - name: Run reusable workflow - uses: ./.github/workflows/run-npm-install.yml + - uses: actions/setup-node@v4 with: - platform-tag: "${{ matrix.platform-tag }}" + node-version: ${{ matrix.nodejs-tag[1] }} + - name: verify runs and is aligned + run: | + npm install xyzparbart; + node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From ba4d311b371cff5ff3d84b8e8b962736a76becbf Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:08:47 -0700 Subject: [PATCH 370/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 02e9090b9..c1f66572f 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -8,9 +8,6 @@ on: type: string required: false default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' - platform-tag: - type: string - required: true jobs: @@ -19,6 +16,8 @@ jobs: strategy: matrix: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} + os: [ubuntu-22.04, 22.04A, 20.04, 20.04A, macos-13-large, SMA, windows-2022] + runs-on: ${{ matrix.os }} fail-fast: false steps: - name: Checkout repository From 1b5bb02723fd7aed455e0758bd4b0682a4a443f4 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:09:12 -0700 Subject: [PATCH 371/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 7028aea09..a87f159c2 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -73,10 +73,6 @@ jobs: # publish-to-npm #] uses: ./.github/workflows/verify-npm-install.yml - strategy: - matrix: - os: [ubuntu-22.04, 22.04A, 20.04, 20.04A, macos-13-large, SMA, windows-2022] - runs-on: ${{ matrix.os }} secrets: inherit From f67c44cfb1c93009ce258da026ec498107863d2e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:10:00 -0700 Subject: [PATCH 372/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index c1f66572f..248a42265 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -17,8 +17,8 @@ jobs: matrix: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} os: [ubuntu-22.04, 22.04A, 20.04, 20.04A, macos-13-large, SMA, windows-2022] - runs-on: ${{ matrix.os }} - fail-fast: false + runs-on: ${{ matrix.os }} + fail-fast: false steps: - name: Checkout repository uses: actions/checkout@v3 From 69162947a4efab831070791f9225fe03411d3b6e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:10:25 -0700 Subject: [PATCH 373/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 248a42265..65e5189dd 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -18,7 +18,6 @@ jobs: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} os: [ubuntu-22.04, 22.04A, 20.04, 20.04A, macos-13-large, SMA, windows-2022] runs-on: ${{ matrix.os }} - fail-fast: false steps: - name: Checkout repository uses: actions/checkout@v3 From d3c83e0924ffc2be17bc7c9f51071d1b963ae576 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:11:03 -0700 Subject: [PATCH 374/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 65e5189dd..e7e7412f7 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -12,7 +12,6 @@ on: jobs: run-npm-install-and-require-test: - needs: get-runner-os strategy: matrix: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} From 170fe7513a34702a7f17acce06661c4c742b6ed1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:13:54 -0700 Subject: [PATCH 375/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index a87f159c2..9a7928ed9 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -73,6 +73,7 @@ jobs: # publish-to-npm #] uses: ./.github/workflows/verify-npm-install.yml + fail-fast: false secrets: inherit From 4adada17c106a170785be756a5cf63c67a43a014 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:16:21 -0700 Subject: [PATCH 376/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 1 - .github/workflows/verify-npm-install.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 9a7928ed9..a87f159c2 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -73,7 +73,6 @@ jobs: # publish-to-npm #] uses: ./.github/workflows/verify-npm-install.yml - fail-fast: false secrets: inherit diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index e7e7412f7..7184e1110 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -13,6 +13,7 @@ on: jobs: run-npm-install-and-require-test: strategy: + fail-fast: false matrix: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} os: [ubuntu-22.04, 22.04A, 20.04, 20.04A, macos-13-large, SMA, windows-2022] From 0ceaec67403d9e0693bdaa0ef68dc38683f6e1c2 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:18:08 -0700 Subject: [PATCH 377/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 7184e1110..767edaeda 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -28,5 +28,5 @@ jobs: - name: verify runs and is aligned run: | - npm install xyzparbart; + npm install xyzparbart --omit-dev; node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From bed369c035c26af3e8bd25df5e545aca3fe83186 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:31:29 -0700 Subject: [PATCH 378/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 767edaeda..f3fa79013 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -15,8 +15,8 @@ jobs: strategy: fail-fast: false matrix: - nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} os: [ubuntu-22.04, 22.04A, 20.04, 20.04A, macos-13-large, SMA, windows-2022] + nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} runs-on: ${{ matrix.os }} steps: - name: Checkout repository @@ -29,4 +29,5 @@ jobs: - name: verify runs and is aligned run: | npm install xyzparbart --omit-dev; + ls ./lib/binding/ node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From cafc0332e9703386309504cd78c077b43aef9a41 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:34:17 -0700 Subject: [PATCH 379/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index f3fa79013..34e7c91e5 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -29,5 +29,5 @@ jobs: - name: verify runs and is aligned run: | npm install xyzparbart --omit-dev; - ls ./lib/binding/ + ls lib/binding node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From be8d27ace79a2f68aecdd84131139f5552f46fff Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:35:24 -0700 Subject: [PATCH 380/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 34e7c91e5..26da36658 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -29,5 +29,5 @@ jobs: - name: verify runs and is aligned run: | npm install xyzparbart --omit-dev; - ls lib/binding + ls . node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From ded502c7793bf2bbaaf05d25f17cb98485364ae8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:38:02 -0700 Subject: [PATCH 381/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 26da36658..4a0b81125 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -29,5 +29,5 @@ jobs: - name: verify runs and is aligned run: | npm install xyzparbart --omit-dev; - ls . + ls lib node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From a1b267c06f6f737771631d5fe49eb96a916ead6a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:42:36 -0700 Subject: [PATCH 382/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 4a0b81125..32fd4e2f7 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -28,6 +28,8 @@ jobs: - name: verify runs and is aligned run: | + mkdir clawn; + cd clawn; npm install xyzparbart --omit-dev; - ls lib + ls node_modules/xyzparbart/lib/binding node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From b8402a0d859dc497a7b19ca609103806639d487b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:45:08 -0700 Subject: [PATCH 383/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 32fd4e2f7..b7d3a4168 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -31,5 +31,4 @@ jobs: mkdir clawn; cd clawn; npm install xyzparbart --omit-dev; - ls node_modules/xyzparbart/lib/binding node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From df2c08fb35b74fef21c5d15ea0b71d8633765eda Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:47:42 -0700 Subject: [PATCH 384/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index b7d3a4168..aa95deaa0 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -31,4 +31,5 @@ jobs: mkdir clawn; cd clawn; npm install xyzparbart --omit-dev; + ls node_modules\xyzparbart\lib\binding node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From a584fcd7c8d06ea4db05d42252c9d0480c804d5d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 09:48:30 -0700 Subject: [PATCH 385/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index aa95deaa0..3b99424bf 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -19,9 +19,6 @@ jobs: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} runs-on: ${{ matrix.os }} steps: - - name: Checkout repository - uses: actions/checkout@v3 - - uses: actions/setup-node@v4 with: node-version: ${{ matrix.nodejs-tag[1] }} From 14fb099fd72d8a1915e24fc79432056c7b9cd702 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 10:53:13 -0700 Subject: [PATCH 386/417] CI/CD enginerring --- .../download-github-artifacts/action.yml | 4 + .github/workflows/build-bindings.yml | 12 ++- .github/workflows/dev-workflow-p2.yml | 88 +++++++++---------- .github/workflows/npm-install-script-test.yml | 6 +- .../workflows/upload-jfrog-build-to-npm.yml | 10 +-- .github/workflows/upload-to-jfrog.yml | 4 +- 6 files changed, 69 insertions(+), 55 deletions(-) diff --git a/.github/actions/download-github-artifacts/action.yml b/.github/actions/download-github-artifacts/action.yml index 3d575016c..b621f2f71 100644 --- a/.github/actions/download-github-artifacts/action.yml +++ b/.github/actions/download-github-artifacts/action.yml @@ -152,3 +152,7 @@ runs: with: name: v131-win_amd64.node path: ./lib/binding/node-v131-win32-x64/ + + + + \ No newline at end of file diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 8f51a5f23..67ef48237 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -345,11 +345,21 @@ jobs: path: ./lib/binding/node-${{ matrix.nodejs-tag[0] }}-darwin-arm64/aerospike.node name: ${{ env.BUILD_IDENTIFIER }}.node + + - name: Cleanup Artifacts + if: ${{ inputs.platform-tag == 'win_amd64' }} + shell: pwsh + run: | + Remove-Item -Recurse -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\obj + Remove-Item -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\aerospike.pdb + Remove-Item -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\aerospike.ipdb + Remove-Item -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\aerospike.iobj + - name: Upload wheels to GitHub Windows uses: actions/upload-artifact@v4 if: ${{ inputs.platform-tag == 'win_amd64' }} with: - path: ./build/Release/aerospike.node + path: ./build/Release/* name: ${{ env.BUILD_IDENTIFIER }}.node - name: Set final commit status diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index a87f159c2..44e52ca5a 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,53 +25,53 @@ jobs: # uses: ./.github/workflows/release-package.yml # secrets: inherit -# rebuild-artifacts-with-new-dev-num: -# #needs: bump-dev-number -# name: Rebuild artifacts with new dev number -# uses: ./.github/workflows/build-artifacts.yml -# with: -# # On pull_request_target, the bump version commit will be ignored -# # So we must pass it manually to the workflow -# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} -# secrets: inherit -# -# #test-npm-install: -# # needs: rebuild-artifacts-with-new-dev-num -# # name: Test npm install command for npm package -# # uses: ./.github/workflows/npm-install-script-test.yml -# # secrets: inherit -# -# upload-to-jfrog: -# name: Upload artifacts to JFrog -# needs: [ -# # bump-dev-number, -# rebuild-artifacts-with-new-dev-num -# ] -# uses: ./.github/workflows/upload-to-jfrog.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit -# -# publish-to-npm: -# name: Upload artifacts to JFrog -# needs: [ -# # bump-dev-number, -# rebuild-artifacts-with-new-dev-num, -# upload-to-jfrog -# ] -# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit + rebuild-artifacts-with-new-dev-num: + #needs: bump-dev-number + name: Rebuild artifacts with new dev number + uses: ./.github/workflows/build-artifacts.yml + with: + # On pull_request_target, the bump version commit will be ignored + # So we must pass it manually to the workflow + sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} + secrets: inherit + + #test-npm-install: + # needs: rebuild-artifacts-with-new-dev-num + # name: Test npm install command for npm package + # uses: ./.github/workflows/npm-install-script-test.yml + # secrets: inherit + + upload-to-jfrog: + name: Upload artifacts to JFrog + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num + ] + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit + + publish-to-npm: + name: Upload artifacts to JFrog + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num, + upload-to-jfrog + ] + uses: ./.github/workflows/upload-jfrog-build-to-npm.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit verify-npm-install: name: verify npm install works correctly - #needs: [ - # bump-dev-number, - # rebuild-artifacts-with-new-dev-num, - # upload-to-jfrog, - # publish-to-npm - #] + needs: [ + bump-dev-number, + rebuild-artifacts-with-new-dev-num, + upload-to-jfrog, + publish-to-npm + ] uses: ./.github/workflows/verify-npm-install.yml secrets: inherit diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index dd989b993..c105a13df 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.30 --no-git-tag-version + run: npm version 6.0.3-dev.31 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.30 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.31 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.30 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.31 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index f040e58aa..b896b63c2 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.30 + NEW_VERSION: 6.0.3-dev.31 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.30/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.31/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.30/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.31/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.30 --no-git-tag-version + npm version 6.0.3-dev.31 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.30/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.31/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index e9dd68f7f..a7dacec3f 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.30 + NEW_VERSION: 6.0.3-dev.31 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.30 + run: jf rt build-publish nodejs-client 6.0.3-dev.31 From 39a15c9300fcf409997f0e48ce30e646fa8357c3 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 10:54:21 -0700 Subject: [PATCH 387/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 44e52ca5a..63c38b9bb 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -67,7 +67,7 @@ jobs: verify-npm-install: name: verify npm install works correctly needs: [ - bump-dev-number, + # bump-dev-number, rebuild-artifacts-with-new-dev-num, upload-to-jfrog, publish-to-npm From c53338ce3939c3544b365613c351ae421c6f39eb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 11:07:07 -0700 Subject: [PATCH 388/417] CI/CD enginerring --- .github/workflows/run-npm-install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-npm-install.yml b/.github/workflows/run-npm-install.yml index 02e9090b9..cb10c5fd7 100644 --- a/.github/workflows/run-npm-install.yml +++ b/.github/workflows/run-npm-install.yml @@ -21,8 +21,8 @@ jobs: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} fail-fast: false steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Delete workspace + run: rm -rf ${{ github.workspace }}/* - uses: actions/setup-node@v4 with: From 758b5e8e0dbcdbcb3e464e339677620dd482cacc Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 11:17:26 -0700 Subject: [PATCH 389/417] CI/CD enginerring --- .github/workflows/build-bindings.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 67ef48237..f076eb010 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -350,10 +350,10 @@ jobs: if: ${{ inputs.platform-tag == 'win_amd64' }} shell: pwsh run: | - Remove-Item -Recurse -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\obj - Remove-Item -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\aerospike.pdb - Remove-Item -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\aerospike.ipdb - Remove-Item -Force .\lib\binding\node-${{ matrix.nodejs-tag[0] }}-win32-x64\aerospike.iobj + Remove-Item -Recurse -Force .\build\release\obj + Remove-Item -Force .\build\release\aerospike.pdb + Remove-Item -Force .\build\release\aerospike.ipdb + Remove-Item -Force .\build\release\aerospike.iobj - name: Upload wheels to GitHub Windows uses: actions/upload-artifact@v4 From 3769fe480849dfb51f00dd51b48db79eebb2ce0a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 11:36:25 -0700 Subject: [PATCH 390/417] Updated APIDOCS to use correct technical terminology for things like transaction, commands, and operations --- aerospike-client-c | 2 +- tsconfig.tsbuildinfo | 2 +- typings/index.d.ts | 866 +++++++++++++++++++++---------------------- 3 files changed, 435 insertions(+), 435 deletions(-) diff --git a/aerospike-client-c b/aerospike-client-c index eaab4eb06..da2bf9abb 160000 --- a/aerospike-client-c +++ b/aerospike-client-c @@ -1 +1 @@ -Subproject commit eaab4eb0616fbb24aa0efecf1ea0f0b3427cff16 +Subproject commit da2bf9abbe96e8cef351975c9b34f3c95d8bb908 diff --git a/tsconfig.tsbuildinfo b/tsconfig.tsbuildinfo index 10c737808..5cac32de7 100644 --- a/tsconfig.tsbuildinfo +++ b/tsconfig.tsbuildinfo @@ -1 +1 @@ -{"fileNames":["../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es5.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2016.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.dom.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.core.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.collection.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.generator.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.iterable.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.promise.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.proxy.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.reflect.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.symbol.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2016.array.include.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2016.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.date.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.object.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.string.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.promise.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2018.regexp.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.array.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.object.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.string.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.symbol.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2019.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.bigint.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.date.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.promise.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.string.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.intl.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.es2020.number.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.decorators.d.ts","../../../.nvm/versions/node/v18.20.4/lib/node_modules/typescript/lib/lib.decorators.legacy.d.ts","./typings/index.d.ts","./node_modules/@types/unist/index.d.ts","./node_modules/@types/hast/index.d.ts","./node_modules/@types/json5/index.d.ts","./node_modules/@types/mdast/index.d.ts","./node_modules/@types/node/compatibility/disposable.d.ts","./node_modules/@types/node/compatibility/indexable.d.ts","./node_modules/@types/node/compatibility/iterators.d.ts","./node_modules/@types/node/compatibility/index.d.ts","./node_modules/@types/node/ts5.6/globals.typedarray.d.ts","./node_modules/@types/node/ts5.6/buffer.buffer.d.ts","./node_modules/undici-types/header.d.ts","./node_modules/undici-types/readable.d.ts","./node_modules/undici-types/file.d.ts","./node_modules/undici-types/fetch.d.ts","./node_modules/undici-types/formdata.d.ts","./node_modules/undici-types/connector.d.ts","./node_modules/undici-types/client.d.ts","./node_modules/undici-types/errors.d.ts","./node_modules/undici-types/dispatcher.d.ts","./node_modules/undici-types/global-dispatcher.d.ts","./node_modules/undici-types/global-origin.d.ts","./node_modules/undici-types/pool-stats.d.ts","./node_modules/undici-types/pool.d.ts","./node_modules/undici-types/handlers.d.ts","./node_modules/undici-types/balanced-pool.d.ts","./node_modules/undici-types/agent.d.ts","./node_modules/undici-types/mock-interceptor.d.ts","./node_modules/undici-types/mock-agent.d.ts","./node_modules/undici-types/mock-client.d.ts","./node_modules/undici-types/mock-pool.d.ts","./node_modules/undici-types/mock-errors.d.ts","./node_modules/undici-types/proxy-agent.d.ts","./node_modules/undici-types/env-http-proxy-agent.d.ts","./node_modules/undici-types/retry-handler.d.ts","./node_modules/undici-types/retry-agent.d.ts","./node_modules/undici-types/api.d.ts","./node_modules/undici-types/interceptors.d.ts","./node_modules/undici-types/util.d.ts","./node_modules/undici-types/cookies.d.ts","./node_modules/undici-types/patch.d.ts","./node_modules/undici-types/websocket.d.ts","./node_modules/undici-types/eventsource.d.ts","./node_modules/undici-types/filereader.d.ts","./node_modules/undici-types/diagnostics-channel.d.ts","./node_modules/undici-types/content-type.d.ts","./node_modules/undici-types/cache.d.ts","./node_modules/undici-types/index.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/sea.d.ts","./node_modules/@types/node/sqlite.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/ts5.6/index.d.ts"],"fileIdsList":[[56,98],[47,56,98],[56,95,98],[56,97,98],[56,98,103,133],[56,98,99,104,110,111,118,130,141],[56,98,99,100,110,118],[51,52,53,56,98],[56,98,101,142],[56,98,102,103,111,119],[56,98,103,130,138],[56,98,104,106,110,118],[56,97,98,105],[56,98,106,107],[56,98,110],[56,98,108,110],[56,97,98,110],[56,98,110,111,112,130,141],[56,98,110,111,112,125,130,133],[56,93,98,146],[56,93,98,106,110,113,118,130,141],[56,98,110,111,113,114,118,130,138,141],[56,98,113,115,130,138,141],[56,98,110,116],[56,98,117,141,146],[56,98,106,110,118,130],[56,98,119],[56,98,120],[56,97,98,121],[56,95,96,97,98,99,100,101,102,103,104,105,106,107,108,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147],[56,98,123],[56,98,124],[56,98,110,125,126],[56,98,125,127,142,144],[56,98,110,130,131,132,133],[56,98,130,132],[56,98,130,131],[56,98,133],[56,98,134],[56,95,98,130],[56,98,110,136,137],[56,98,136,137],[56,98,103,118,130,138],[56,98,139],[98],[54,55,56,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147],[56,98,118,140],[56,98,113,124,141],[56,98,103,142],[56,98,130,143],[56,98,117,144],[56,98,145],[56,98,103,110,112,121,130,141,144,146],[56,98,130,147],[56,65,69,98,141],[56,65,98,130,141],[56,60,98],[56,62,65,98,138,141],[56,98,118,138],[56,98,148],[56,60,98,148],[56,62,65,98,118,141],[56,57,58,61,64,98,110,130,141],[56,65,72,98],[56,57,63,98],[56,65,86,87,98],[56,61,65,98,133,141,148],[56,86,98,148],[56,59,60,98,148],[56,65,98],[56,59,60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,87,88,89,90,91,92,98],[56,65,80,98],[56,65,72,73,98],[56,63,65,73,74,98],[56,64,98],[56,57,60,65,98],[56,65,69,73,74,98],[56,69,98],[56,63,65,68,98,141],[56,57,62,65,72,98],[56,98,130],[56,60,65,86,98,146,148]],"fileInfos":[{"version":"44e584d4f6444f58791784f1d530875970993129442a847597db702a073ca68c","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"3facaf05f0c5fc569c5649dd359892c98a85557e3e0c847964caeb67076f4d75","impliedFormat":1},{"version":"9a68c0c07ae2fa71b44384a839b7b8d81662a236d4b9ac30916718f7510b1b2d","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"9e8ca8ed051c2697578c023d9c29d6df689a083561feba5c14aedee895853999","affectsGlobalScope":true,"impliedFormat":1},{"version":"6920e1448680767498a0b77c6a00a8e77d14d62c3da8967b171f1ddffa3c18e4","affectsGlobalScope":true,"impliedFormat":1},{"version":"dc2df20b1bcdc8c2d34af4926e2c3ab15ffe1160a63e58b7e09833f616efff44","affectsGlobalScope":true,"impliedFormat":1},{"version":"515d0b7b9bea2e31ea4ec968e9edd2c39d3eebf4a2d5cbd04e88639819ae3b71","affectsGlobalScope":true,"impliedFormat":1},{"version":"45d8ccb3dfd57355eb29749919142d4321a0aa4df6acdfc54e30433d7176600a","affectsGlobalScope":true,"impliedFormat":1},{"version":"0dc1e7ceda9b8b9b455c3a2d67b0412feab00bd2f66656cd8850e8831b08b537","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"4ff2a353abf8a80ee399af572debb8faab2d33ad38c4b4474cff7f26e7653b8d","affectsGlobalScope":true,"impliedFormat":1},{"version":"93495ff27b8746f55d19fcbcdbaccc99fd95f19d057aed1bd2c0cafe1335fbf0","affectsGlobalScope":true,"impliedFormat":1},{"version":"6fc23bb8c3965964be8c597310a2878b53a0306edb71d4b5a4dfe760186bcc01","affectsGlobalScope":true,"impliedFormat":1},{"version":"ea011c76963fb15ef1cdd7ce6a6808b46322c527de2077b6cfdf23ae6f5f9ec7","affectsGlobalScope":true,"impliedFormat":1},{"version":"38f0219c9e23c915ef9790ab1d680440d95419ad264816fa15009a8851e79119","affectsGlobalScope":true,"impliedFormat":1},{"version":"69ab18c3b76cd9b1be3d188eaf8bba06112ebbe2f47f6c322b5105a6fbc45a2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"4de680d5bb41c17f7f68e0419412ca23c98d5749dcaaea1896172f06435891fc","affectsGlobalScope":true,"impliedFormat":1},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac9538681b19688c8eae65811b329d3744af679e0bdfa5d842d0e32524c73e1c","affectsGlobalScope":true,"impliedFormat":1},{"version":"0a969edff4bd52585473d24995c5ef223f6652d6ef46193309b3921d65dd4376","affectsGlobalScope":true,"impliedFormat":1},{"version":"9e9fbd7030c440b33d021da145d3232984c8bb7916f277e8ffd3dc2e3eae2bdb","affectsGlobalScope":true,"impliedFormat":1},{"version":"811ec78f7fefcabbda4bfa93b3eb67d9ae166ef95f9bff989d964061cbf81a0c","affectsGlobalScope":true,"impliedFormat":1},{"version":"717937616a17072082152a2ef351cb51f98802fb4b2fdabd32399843875974ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"d7e7d9b7b50e5f22c915b525acc5a49a7a6584cf8f62d0569e557c5cfc4b2ac2","affectsGlobalScope":true,"impliedFormat":1},{"version":"71c37f4c9543f31dfced6c7840e068c5a5aacb7b89111a4364b1d5276b852557","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"74f7fa2d027d5b33eb0471c8e82a6c87216223181ec31247c357a3e8e2fddc5b","affectsGlobalScope":true,"impliedFormat":1},{"version":"1a94697425a99354df73d9c8291e2ecd4dddd370aed4023c2d6dee6cccb32666","affectsGlobalScope":true,"impliedFormat":1},{"version":"063600664504610fe3e99b717a1223f8b1900087fab0b4cad1496a114744f8df","affectsGlobalScope":true,"impliedFormat":1},{"version":"934019d7e3c81950f9a8426d093458b65d5aff2c7c1511233c0fd5b941e608ab","affectsGlobalScope":true,"impliedFormat":1},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true,"impliedFormat":1},{"version":"e3f9fc0ec0b96a9e642f11eda09c0be83a61c7b336977f8b9fdb1e9788e925fe","affectsGlobalScope":true,"impliedFormat":1},{"version":"59fb2c069260b4ba00b5643b907ef5d5341b167e7d1dbf58dfd895658bda2867","affectsGlobalScope":true,"impliedFormat":1},{"version":"479553e3779be7d4f68e9f40cdb82d038e5ef7592010100410723ceced22a0f7","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"33358442698bb565130f52ba79bfd3d4d484ac85fe33f3cb1759c54d18201393","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},"3393401d6e8160a105adc80feccd0b57b93198ad5689bcbd90966322f302bb72",{"version":"89121c1bf2990f5219bfd802a3e7fc557de447c62058d6af68d6b6348d64499a","impliedFormat":1},{"version":"79b4369233a12c6fa4a07301ecb7085802c98f3a77cf9ab97eee27e1656f82e6","impliedFormat":1},{"version":"96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","impliedFormat":1},{"version":"d4a22007b481fe2a2e6bfd3a42c00cd62d41edb36d30fc4697df2692e9891fc8","impliedFormat":1},{"version":"70521b6ab0dcba37539e5303104f29b721bfb2940b2776da4cc818c07e1fefc1","affectsGlobalScope":true,"impliedFormat":1},{"version":"030e350db2525514580ed054f712ffb22d273e6bc7eddc1bb7eda1e0ba5d395e","affectsGlobalScope":true,"impliedFormat":1},{"version":"d153a11543fd884b596587ccd97aebbeed950b26933ee000f94009f1ab142848","affectsGlobalScope":true,"impliedFormat":1},{"version":"21d819c173c0cf7cc3ce57c3276e77fd9a8a01d35a06ad87158781515c9a438a","impliedFormat":1},{"version":"613b21ccdf3be6329d56e6caa13b258c842edf8377be7bc9f014ed14cdcfc308","affectsGlobalScope":true,"impliedFormat":1},{"version":"2d1319e6b5d0efd8c5eae07eb864a00102151e8b9afddd2d45db52e9aae002c4","affectsGlobalScope":true,"impliedFormat":1},{"version":"5929864ce17fba74232584d90cb721a89b7ad277220627cc97054ba15a98ea8f","impliedFormat":1},{"version":"24bd580b5743dc56402c440dc7f9a4f5d592ad7a419f25414d37a7bfe11e342b","impliedFormat":1},{"version":"25c8056edf4314820382a5fdb4bb7816999acdcb929c8f75e3f39473b87e85bc","impliedFormat":1},{"version":"c464d66b20788266e5353b48dc4aa6bc0dc4a707276df1e7152ab0c9ae21fad8","impliedFormat":1},{"version":"78d0d27c130d35c60b5e5566c9f1e5be77caf39804636bc1a40133919a949f21","impliedFormat":1},{"version":"c6fd2c5a395f2432786c9cb8deb870b9b0e8ff7e22c029954fabdd692bff6195","impliedFormat":1},{"version":"1d6e127068ea8e104a912e42fc0a110e2aa5a66a356a917a163e8cf9a65e4a75","impliedFormat":1},{"version":"5ded6427296cdf3b9542de4471d2aa8d3983671d4cac0f4bf9c637208d1ced43","impliedFormat":1},{"version":"6bdc71028db658243775263e93a7db2fd2abfce3ca569c3cca5aee6ed5eb186d","impliedFormat":1},{"version":"cadc8aced301244057c4e7e73fbcae534b0f5b12a37b150d80e5a45aa4bebcbd","impliedFormat":1},{"version":"385aab901643aa54e1c36f5ef3107913b10d1b5bb8cbcd933d4263b80a0d7f20","impliedFormat":1},{"version":"9670d44354bab9d9982eca21945686b5c24a3f893db73c0dae0fd74217a4c219","impliedFormat":1},{"version":"0b8a9268adaf4da35e7fa830c8981cfa22adbbe5b3f6f5ab91f6658899e657a7","impliedFormat":1},{"version":"11396ed8a44c02ab9798b7dca436009f866e8dae3c9c25e8c1fbc396880bf1bb","impliedFormat":1},{"version":"ba7bc87d01492633cb5a0e5da8a4a42a1c86270e7b3d2dea5d156828a84e4882","impliedFormat":1},{"version":"4893a895ea92c85345017a04ed427cbd6a1710453338df26881a6019432febdd","impliedFormat":1},{"version":"c21dc52e277bcfc75fac0436ccb75c204f9e1b3fa5e12729670910639f27343e","impliedFormat":1},{"version":"13f6f39e12b1518c6650bbb220c8985999020fe0f21d818e28f512b7771d00f9","impliedFormat":1},{"version":"9b5369969f6e7175740bf51223112ff209f94ba43ecd3bb09eefff9fd675624a","impliedFormat":1},{"version":"4fe9e626e7164748e8769bbf74b538e09607f07ed17c2f20af8d680ee49fc1da","impliedFormat":1},{"version":"24515859bc0b836719105bb6cc3d68255042a9f02a6022b3187948b204946bd2","impliedFormat":1},{"version":"ea0148f897b45a76544ae179784c95af1bd6721b8610af9ffa467a518a086a43","impliedFormat":1},{"version":"24c6a117721e606c9984335f71711877293a9651e44f59f3d21c1ea0856f9cc9","impliedFormat":1},{"version":"dd3273ead9fbde62a72949c97dbec2247ea08e0c6952e701a483d74ef92d6a17","impliedFormat":1},{"version":"405822be75ad3e4d162e07439bac80c6bcc6dbae1929e179cf467ec0b9ee4e2e","impliedFormat":1},{"version":"0db18c6e78ea846316c012478888f33c11ffadab9efd1cc8bcc12daded7a60b6","impliedFormat":1},{"version":"e61be3f894b41b7baa1fbd6a66893f2579bfad01d208b4ff61daef21493ef0a8","impliedFormat":1},{"version":"bd0532fd6556073727d28da0edfd1736417a3f9f394877b6d5ef6ad88fba1d1a","impliedFormat":1},{"version":"89167d696a849fce5ca508032aabfe901c0868f833a8625d5a9c6e861ef935d2","impliedFormat":1},{"version":"615ba88d0128ed16bf83ef8ccbb6aff05c3ee2db1cc0f89ab50a4939bfc1943f","impliedFormat":1},{"version":"a4d551dbf8746780194d550c88f26cf937caf8d56f102969a110cfaed4b06656","impliedFormat":1},{"version":"8bd86b8e8f6a6aa6c49b71e14c4ffe1211a0e97c80f08d2c8cc98838006e4b88","impliedFormat":1},{"version":"317e63deeb21ac07f3992f5b50cdca8338f10acd4fbb7257ebf56735bf52ab00","impliedFormat":1},{"version":"4732aec92b20fb28c5fe9ad99521fb59974289ed1e45aecb282616202184064f","impliedFormat":1},{"version":"2e85db9e6fd73cfa3d7f28e0ab6b55417ea18931423bd47b409a96e4a169e8e6","impliedFormat":1},{"version":"c46e079fe54c76f95c67fb89081b3e399da2c7d109e7dca8e4b58d83e332e605","impliedFormat":1},{"version":"bf67d53d168abc1298888693338cb82854bdb2e69ef83f8a0092093c2d562107","impliedFormat":1},{"version":"81184fe8e67d78ac4e5374650f0892d547d665d77da2b2f544b5d84729c4a15d","affectsGlobalScope":true,"impliedFormat":1},{"version":"f52e8dacc97d71dcc96af29e49584353f9c54cb916d132e3e768d8b8129c928d","impliedFormat":1},{"version":"7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419","impliedFormat":1},{"version":"76103716ba397bbb61f9fa9c9090dca59f39f9047cb1352b2179c5d8e7f4e8d0","impliedFormat":1},{"version":"53eac70430b30089a3a1959d8306b0f9cfaf0de75224b68ef25243e0b5ad1ca3","affectsGlobalScope":true,"impliedFormat":1},{"version":"4314c7a11517e221f7296b46547dbc4df047115b182f544d072bdccffa57fc72","impliedFormat":1},{"version":"115971d64632ea4742b5b115fb64ed04bcaae2c3c342f13d9ba7e3f9ee39c4e7","impliedFormat":1},{"version":"c2510f124c0293ab80b1777c44d80f812b75612f297b9857406468c0f4dafe29","affectsGlobalScope":true,"impliedFormat":1},{"version":"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","impliedFormat":1},{"version":"86956cc2eb9dd371d6fab493d326a574afedebf76eef3fa7833b8e0d9b52d6f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"24642567d3729bcc545bacb65ee7c0db423400c7f1ef757cab25d05650064f98","impliedFormat":1},{"version":"e6f5a38687bebe43a4cef426b69d34373ef68be9a6b1538ec0a371e69f309354","impliedFormat":1},{"version":"a6bf63d17324010ca1fbf0389cab83f93389bb0b9a01dc8a346d092f65b3605f","impliedFormat":1},{"version":"e009777bef4b023a999b2e5b9a136ff2cde37dc3f77c744a02840f05b18be8ff","impliedFormat":1},{"version":"1e0d1f8b0adfa0b0330e028c7941b5a98c08b600efe7f14d2d2a00854fb2f393","impliedFormat":1},{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true,"impliedFormat":1},{"version":"875928df2f3e9a3aed4019539a15d04ff6140a06df6cd1b2feb836d22a81eaca","affectsGlobalScope":true,"impliedFormat":1},{"version":"e9ad08a376ac84948fcca0013d6f1d4ae4f9522e26b91f87945b97c99d7cc30b","impliedFormat":1},{"version":"eaf9ee1d90a35d56264f0bf39842282c58b9219e112ac7d0c1bce98c6c5da672","impliedFormat":1},{"version":"c15c4427ae7fd1dcd7f312a8a447ac93581b0d4664ddf151ecd07de4bf2bb9d7","impliedFormat":1},{"version":"5135bdd72cc05a8192bd2e92f0914d7fc43ee077d1293dc622a049b7035a0afb","impliedFormat":1},{"version":"4f80de3a11c0d2f1329a72e92c7416b2f7eab14f67e92cac63bb4e8d01c6edc8","impliedFormat":1},{"version":"6d386bc0d7f3afa1d401afc3e00ed6b09205a354a9795196caed937494a713e6","impliedFormat":1},{"version":"75c3400359d59fae5aed4c4a59fcd8a9760cf451e25dc2174cb5e08b9d4803e2","affectsGlobalScope":true,"impliedFormat":1},{"version":"94c4187083503a74f4544503b5a30e2bd7af0032dc739b0c9a7ce87f8bddc7b9","impliedFormat":1},{"version":"b1b6ee0d012aeebe11d776a155d8979730440082797695fc8e2a5c326285678f","impliedFormat":1},{"version":"45875bcae57270aeb3ebc73a5e3fb4c7b9d91d6b045f107c1d8513c28ece71c0","impliedFormat":1},{"version":"3eb62baae4df08c9173e6903d3ca45942ccec8c3659b0565684a75f3292cffbb","affectsGlobalScope":true,"impliedFormat":1},{"version":"a85683ef86875f4ad4c6b7301bbcc63fb379a8d80d3d3fd735ee57f48ef8a47e","affectsGlobalScope":true,"impliedFormat":1},{"version":"3f16a7e4deafa527ed9995a772bb380eb7d3c2c0fd4ae178c5263ed18394db2c","impliedFormat":1},{"version":"c6b4e0a02545304935ecbf7de7a8e056a31bb50939b5b321c9d50a405b5a0bba","impliedFormat":1},{"version":"fab29e6d649aa074a6b91e3bdf2bff484934a46067f6ee97a30fcd9762ae2213","impliedFormat":1},{"version":"8145e07aad6da5f23f2fcd8c8e4c5c13fb26ee986a79d03b0829b8fce152d8b2","impliedFormat":1},{"version":"e1120271ebbc9952fdc7b2dd3e145560e52e06956345e6fdf91d70ca4886464f","impliedFormat":1},{"version":"15c5e91b5f08be34a78e3d976179bf5b7a9cc28dc0ef1ffebffeb3c7812a2dca","impliedFormat":1},{"version":"a8f06c2382a30b7cb89ad2dfc48fc3b2b490f3dafcd839dadc008e4e5d57031d","impliedFormat":1},{"version":"553870e516f8c772b89f3820576152ebc70181d7994d96917bb943e37da7f8a7","impliedFormat":1},{"version":"37ba7b45141a45ce6e80e66f2a96c8a5ab1bcef0fc2d0f56bb58df96ec67e972","impliedFormat":1},{"version":"93452d394fdd1dc551ec62f5042366f011a00d342d36d50793b3529bfc9bd633","impliedFormat":1},{"version":"745c4240220559bd340c8aeb6e3c5270a709d3565e934dc22a69c304703956bc","affectsGlobalScope":true,"impliedFormat":1},{"version":"2754d8221d77c7b382096651925eb476f1066b3348da4b73fe71ced7801edada","impliedFormat":1},{"version":"9212c6e9d80cb45441a3614e95afd7235a55a18584c2ed32d6c1aca5a0c53d93","affectsGlobalScope":true,"impliedFormat":1},{"version":"bef91efa0baea5d0e0f0f27b574a8bc100ce62a6d7e70220a0d58af6acab5e89","affectsGlobalScope":true,"impliedFormat":1},{"version":"282fd2a1268a25345b830497b4b7bf5037a5e04f6a9c44c840cb605e19fea841","impliedFormat":1},{"version":"5360a27d3ebca11b224d7d3e38e3e2c63f8290cb1fcf6c3610401898f8e68bc3","impliedFormat":1},{"version":"66ba1b2c3e3a3644a1011cd530fb444a96b1b2dfe2f5e837a002d41a1a799e60","impliedFormat":1},{"version":"7e514f5b852fdbc166b539fdd1f4e9114f29911592a5eb10a94bb3a13ccac3c4","impliedFormat":1},{"version":"7d6ff413e198d25639f9f01f16673e7df4e4bd2875a42455afd4ecc02ef156da","affectsGlobalScope":true,"impliedFormat":1},{"version":"6bd91a2a356600dee28eb0438082d0799a18a974a6537c4410a796bab749813c","affectsGlobalScope":true,"impliedFormat":1},{"version":"f689c4237b70ae6be5f0e4180e8833f34ace40529d1acc0676ab8fb8f70457d7","impliedFormat":1},{"version":"ae25afbbf1ed5df63a177d67b9048bf7481067f1b8dc9c39212e59db94fc9fc6","impliedFormat":1},{"version":"ac5ed35e649cdd8143131964336ab9076937fa91802ec760b3ea63b59175c10a","impliedFormat":1},{"version":"52a8e7e8a1454b6d1b5ad428efae3870ffc56f2c02d923467f2940c454aa9aec","affectsGlobalScope":true,"impliedFormat":1},{"version":"78dc0513cc4f1642906b74dda42146bcbd9df7401717d6e89ea6d72d12ecb539","impliedFormat":1},{"version":"171fd8807643c46a9d17e843959abdf10480d57d60d38d061fb44a4c8d4a8cc4","impliedFormat":1}],"root":[46],"options":{"allowJs":true,"alwaysStrict":true,"declaration":true,"emitDeclarationOnly":true,"emitDecoratorMetadata":true,"esModuleInterop":true,"experimentalDecorators":true,"importHelpers":true,"module":1,"noEmitHelpers":true,"noImplicitAny":false,"removeComments":true,"skipLibCheck":true,"strict":true,"target":1},"referencedMap":[[44,1],[45,1],[8,1],[10,1],[9,1],[2,1],[11,1],[12,1],[13,1],[14,1],[15,1],[16,1],[17,1],[18,1],[3,1],[19,1],[4,1],[20,1],[24,1],[21,1],[22,1],[23,1],[25,1],[26,1],[27,1],[5,1],[28,1],[29,1],[30,1],[31,1],[6,1],[35,1],[32,1],[33,1],[34,1],[36,1],[7,1],[37,1],[42,1],[43,1],[38,1],[39,1],[40,1],[41,1],[1,1],[48,2],[49,1],[50,2],[95,3],[96,3],[97,4],[98,5],[99,6],[100,7],[51,1],[54,8],[52,1],[53,1],[101,9],[102,10],[103,11],[104,12],[105,13],[106,14],[107,14],[109,15],[108,16],[110,17],[111,18],[112,19],[94,20],[113,21],[114,22],[115,23],[116,24],[117,25],[118,26],[119,27],[120,28],[121,29],[122,30],[123,31],[124,32],[125,33],[126,33],[127,34],[128,1],[129,1],[130,35],[132,36],[131,37],[133,38],[134,39],[135,40],[136,41],[137,42],[138,43],[139,44],[56,45],[55,1],[148,46],[140,47],[141,48],[142,49],[143,50],[144,51],[145,52],[146,53],[147,54],[47,1],[72,55],[82,56],[71,55],[92,57],[63,58],[62,59],[91,60],[85,61],[90,62],[65,63],[79,64],[64,65],[88,66],[60,67],[59,60],[89,68],[61,69],[66,70],[67,1],[70,70],[57,1],[93,71],[83,72],[74,73],[75,74],[77,75],[73,76],[76,77],[86,60],[68,78],[69,79],[78,80],[58,81],[81,72],[80,70],[84,1],[87,82],[46,81]],"version":"5.6.3"} \ No newline at end of file +{"fileNames":["./node_modules/typescript/lib/lib.es5.d.ts","./node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/typescript/lib/lib.dom.d.ts","./node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/typescript/lib/lib.es2016.intl.d.ts","./node_modules/typescript/lib/lib.es2017.date.d.ts","./node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/typescript/lib/lib.decorators.d.ts","./node_modules/typescript/lib/lib.decorators.legacy.d.ts","./typings/index.d.ts","./node_modules/@types/unist/index.d.ts","./node_modules/@types/hast/index.d.ts","./node_modules/@types/json5/index.d.ts","./node_modules/@types/mdast/index.d.ts","./node_modules/@types/node/compatibility/disposable.d.ts","./node_modules/@types/node/compatibility/indexable.d.ts","./node_modules/@types/node/compatibility/iterators.d.ts","./node_modules/@types/node/compatibility/index.d.ts","./node_modules/@types/node/ts5.6/globals.typedarray.d.ts","./node_modules/@types/node/ts5.6/buffer.buffer.d.ts","./node_modules/undici-types/header.d.ts","./node_modules/undici-types/readable.d.ts","./node_modules/undici-types/file.d.ts","./node_modules/undici-types/fetch.d.ts","./node_modules/undici-types/formdata.d.ts","./node_modules/undici-types/connector.d.ts","./node_modules/undici-types/client.d.ts","./node_modules/undici-types/errors.d.ts","./node_modules/undici-types/dispatcher.d.ts","./node_modules/undici-types/global-dispatcher.d.ts","./node_modules/undici-types/global-origin.d.ts","./node_modules/undici-types/pool-stats.d.ts","./node_modules/undici-types/pool.d.ts","./node_modules/undici-types/handlers.d.ts","./node_modules/undici-types/balanced-pool.d.ts","./node_modules/undici-types/agent.d.ts","./node_modules/undici-types/mock-interceptor.d.ts","./node_modules/undici-types/mock-agent.d.ts","./node_modules/undici-types/mock-client.d.ts","./node_modules/undici-types/mock-pool.d.ts","./node_modules/undici-types/mock-errors.d.ts","./node_modules/undici-types/proxy-agent.d.ts","./node_modules/undici-types/env-http-proxy-agent.d.ts","./node_modules/undici-types/retry-handler.d.ts","./node_modules/undici-types/retry-agent.d.ts","./node_modules/undici-types/api.d.ts","./node_modules/undici-types/interceptors.d.ts","./node_modules/undici-types/util.d.ts","./node_modules/undici-types/cookies.d.ts","./node_modules/undici-types/patch.d.ts","./node_modules/undici-types/websocket.d.ts","./node_modules/undici-types/eventsource.d.ts","./node_modules/undici-types/filereader.d.ts","./node_modules/undici-types/diagnostics-channel.d.ts","./node_modules/undici-types/content-type.d.ts","./node_modules/undici-types/cache.d.ts","./node_modules/undici-types/index.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/sea.d.ts","./node_modules/@types/node/sqlite.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/ts5.6/index.d.ts"],"fileIdsList":[[47,56,98],[56,98],[56,95,98],[56,97,98],[56,98,103,133],[56,98,99,104,110,111,118,130,141],[56,98,99,100,110,118],[51,52,53,56,98],[56,98,101,142],[56,98,102,103,111,119],[56,98,103,130,138],[56,98,104,106,110,118],[56,97,98,105],[56,98,106,107],[56,98,110],[56,98,108,110],[56,97,98,110],[56,98,110,111,112,130,141],[56,98,110,111,112,125,130,133],[56,93,98,146],[56,93,98,106,110,113,118,130,141],[56,98,110,111,113,114,118,130,138,141],[56,98,113,115,130,138,141],[56,98,110,116],[56,98,117,141,146],[56,98,106,110,118,130],[56,98,119],[56,98,120],[56,97,98,121],[56,95,96,97,98,99,100,101,102,103,104,105,106,107,108,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147],[56,98,123],[56,98,124],[56,98,110,125,126],[56,98,125,127,142,144],[56,98,110,130,131,132,133],[56,98,130,132],[56,98,130,131],[56,98,133],[56,98,134],[56,95,98,130],[56,98,110,136,137],[56,98,136,137],[56,98,103,118,130,138],[56,98,139],[98],[54,55,56,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147],[56,98,118,140],[56,98,113,124,141],[56,98,103,142],[56,98,130,143],[56,98,117,144],[56,98,145],[56,98,103,110,112,121,130,141,144,146],[56,98,130,147],[56,65,69,98,141],[56,65,98,130,141],[56,60,98],[56,62,65,98,138,141],[56,98,118,138],[56,98,148],[56,60,98,148],[56,62,65,98,118,141],[56,57,58,61,64,98,110,130,141],[56,65,72,98],[56,57,63,98],[56,65,86,87,98],[56,61,65,98,133,141,148],[56,86,98,148],[56,59,60,98,148],[56,65,98],[56,59,60,61,62,63,64,65,66,67,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,87,88,89,90,91,92,98],[56,65,80,98],[56,65,72,73,98],[56,63,65,73,74,98],[56,64,98],[56,57,60,65,98],[56,65,69,73,74,98],[56,69,98],[56,63,65,68,98,141],[56,57,62,65,72,98],[56,98,130],[56,60,65,86,98,146,148]],"fileInfos":[{"version":"44e584d4f6444f58791784f1d530875970993129442a847597db702a073ca68c","affectsGlobalScope":true,"impliedFormat":1},{"version":"45b7ab580deca34ae9729e97c13cfd999df04416a79116c3bfb483804f85ded4","impliedFormat":1},{"version":"3facaf05f0c5fc569c5649dd359892c98a85557e3e0c847964caeb67076f4d75","impliedFormat":1},{"version":"9a68c0c07ae2fa71b44384a839b7b8d81662a236d4b9ac30916718f7510b1b2d","impliedFormat":1},{"version":"5e1c4c362065a6b95ff952c0eab010f04dcd2c3494e813b493ecfd4fcb9fc0d8","impliedFormat":1},{"version":"68d73b4a11549f9c0b7d352d10e91e5dca8faa3322bfb77b661839c42b1ddec7","impliedFormat":1},{"version":"5efce4fc3c29ea84e8928f97adec086e3dc876365e0982cc8479a07954a3efd4","impliedFormat":1},{"version":"9e8ca8ed051c2697578c023d9c29d6df689a083561feba5c14aedee895853999","affectsGlobalScope":true,"impliedFormat":1},{"version":"6920e1448680767498a0b77c6a00a8e77d14d62c3da8967b171f1ddffa3c18e4","affectsGlobalScope":true,"impliedFormat":1},{"version":"dc2df20b1bcdc8c2d34af4926e2c3ab15ffe1160a63e58b7e09833f616efff44","affectsGlobalScope":true,"impliedFormat":1},{"version":"515d0b7b9bea2e31ea4ec968e9edd2c39d3eebf4a2d5cbd04e88639819ae3b71","affectsGlobalScope":true,"impliedFormat":1},{"version":"45d8ccb3dfd57355eb29749919142d4321a0aa4df6acdfc54e30433d7176600a","affectsGlobalScope":true,"impliedFormat":1},{"version":"0dc1e7ceda9b8b9b455c3a2d67b0412feab00bd2f66656cd8850e8831b08b537","affectsGlobalScope":true,"impliedFormat":1},{"version":"ce691fb9e5c64efb9547083e4a34091bcbe5bdb41027e310ebba8f7d96a98671","affectsGlobalScope":true,"impliedFormat":1},{"version":"8d697a2a929a5fcb38b7a65594020fcef05ec1630804a33748829c5ff53640d0","affectsGlobalScope":true,"impliedFormat":1},{"version":"4ff2a353abf8a80ee399af572debb8faab2d33ad38c4b4474cff7f26e7653b8d","affectsGlobalScope":true,"impliedFormat":1},{"version":"93495ff27b8746f55d19fcbcdbaccc99fd95f19d057aed1bd2c0cafe1335fbf0","affectsGlobalScope":true,"impliedFormat":1},{"version":"6fc23bb8c3965964be8c597310a2878b53a0306edb71d4b5a4dfe760186bcc01","affectsGlobalScope":true,"impliedFormat":1},{"version":"ea011c76963fb15ef1cdd7ce6a6808b46322c527de2077b6cfdf23ae6f5f9ec7","affectsGlobalScope":true,"impliedFormat":1},{"version":"38f0219c9e23c915ef9790ab1d680440d95419ad264816fa15009a8851e79119","affectsGlobalScope":true,"impliedFormat":1},{"version":"69ab18c3b76cd9b1be3d188eaf8bba06112ebbe2f47f6c322b5105a6fbc45a2e","affectsGlobalScope":true,"impliedFormat":1},{"version":"4738f2420687fd85629c9efb470793bb753709c2379e5f85bc1815d875ceadcd","affectsGlobalScope":true,"impliedFormat":1},{"version":"2f11ff796926e0832f9ae148008138ad583bd181899ab7dd768a2666700b1893","affectsGlobalScope":true,"impliedFormat":1},{"version":"4de680d5bb41c17f7f68e0419412ca23c98d5749dcaaea1896172f06435891fc","affectsGlobalScope":true,"impliedFormat":1},{"version":"9fc46429fbe091ac5ad2608c657201eb68b6f1b8341bd6d670047d32ed0a88fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"ac9538681b19688c8eae65811b329d3744af679e0bdfa5d842d0e32524c73e1c","affectsGlobalScope":true,"impliedFormat":1},{"version":"0a969edff4bd52585473d24995c5ef223f6652d6ef46193309b3921d65dd4376","affectsGlobalScope":true,"impliedFormat":1},{"version":"9e9fbd7030c440b33d021da145d3232984c8bb7916f277e8ffd3dc2e3eae2bdb","affectsGlobalScope":true,"impliedFormat":1},{"version":"811ec78f7fefcabbda4bfa93b3eb67d9ae166ef95f9bff989d964061cbf81a0c","affectsGlobalScope":true,"impliedFormat":1},{"version":"717937616a17072082152a2ef351cb51f98802fb4b2fdabd32399843875974ca","affectsGlobalScope":true,"impliedFormat":1},{"version":"d7e7d9b7b50e5f22c915b525acc5a49a7a6584cf8f62d0569e557c5cfc4b2ac2","affectsGlobalScope":true,"impliedFormat":1},{"version":"71c37f4c9543f31dfced6c7840e068c5a5aacb7b89111a4364b1d5276b852557","affectsGlobalScope":true,"impliedFormat":1},{"version":"576711e016cf4f1804676043e6a0a5414252560eb57de9faceee34d79798c850","affectsGlobalScope":true,"impliedFormat":1},{"version":"89c1b1281ba7b8a96efc676b11b264de7a8374c5ea1e6617f11880a13fc56dc6","affectsGlobalScope":true,"impliedFormat":1},{"version":"74f7fa2d027d5b33eb0471c8e82a6c87216223181ec31247c357a3e8e2fddc5b","affectsGlobalScope":true,"impliedFormat":1},{"version":"1a94697425a99354df73d9c8291e2ecd4dddd370aed4023c2d6dee6cccb32666","affectsGlobalScope":true,"impliedFormat":1},{"version":"063600664504610fe3e99b717a1223f8b1900087fab0b4cad1496a114744f8df","affectsGlobalScope":true,"impliedFormat":1},{"version":"934019d7e3c81950f9a8426d093458b65d5aff2c7c1511233c0fd5b941e608ab","affectsGlobalScope":true,"impliedFormat":1},{"version":"bf14a426dbbf1022d11bd08d6b8e709a2e9d246f0c6c1032f3b2edb9a902adbe","affectsGlobalScope":true,"impliedFormat":1},{"version":"e3f9fc0ec0b96a9e642f11eda09c0be83a61c7b336977f8b9fdb1e9788e925fe","affectsGlobalScope":true,"impliedFormat":1},{"version":"59fb2c069260b4ba00b5643b907ef5d5341b167e7d1dbf58dfd895658bda2867","affectsGlobalScope":true,"impliedFormat":1},{"version":"479553e3779be7d4f68e9f40cdb82d038e5ef7592010100410723ceced22a0f7","affectsGlobalScope":true,"impliedFormat":1},{"version":"368af93f74c9c932edd84c58883e736c9e3d53cec1fe24c0b0ff451f529ceab1","affectsGlobalScope":true,"impliedFormat":1},{"version":"33358442698bb565130f52ba79bfd3d4d484ac85fe33f3cb1759c54d18201393","affectsGlobalScope":true,"impliedFormat":1},{"version":"782dec38049b92d4e85c1585fbea5474a219c6984a35b004963b00beb1aab538","affectsGlobalScope":true,"impliedFormat":1},"af063e4d3d93a9d8ff595268f3e71fa66e6eabe20673b3269dd70c37d1013308",{"version":"89121c1bf2990f5219bfd802a3e7fc557de447c62058d6af68d6b6348d64499a","impliedFormat":1},{"version":"79b4369233a12c6fa4a07301ecb7085802c98f3a77cf9ab97eee27e1656f82e6","impliedFormat":1},{"version":"96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","impliedFormat":1},{"version":"d4a22007b481fe2a2e6bfd3a42c00cd62d41edb36d30fc4697df2692e9891fc8","impliedFormat":1},{"version":"70521b6ab0dcba37539e5303104f29b721bfb2940b2776da4cc818c07e1fefc1","affectsGlobalScope":true,"impliedFormat":1},{"version":"030e350db2525514580ed054f712ffb22d273e6bc7eddc1bb7eda1e0ba5d395e","affectsGlobalScope":true,"impliedFormat":1},{"version":"d153a11543fd884b596587ccd97aebbeed950b26933ee000f94009f1ab142848","affectsGlobalScope":true,"impliedFormat":1},{"version":"21d819c173c0cf7cc3ce57c3276e77fd9a8a01d35a06ad87158781515c9a438a","impliedFormat":1},{"version":"613b21ccdf3be6329d56e6caa13b258c842edf8377be7bc9f014ed14cdcfc308","affectsGlobalScope":true,"impliedFormat":1},{"version":"2d1319e6b5d0efd8c5eae07eb864a00102151e8b9afddd2d45db52e9aae002c4","affectsGlobalScope":true,"impliedFormat":1},{"version":"5929864ce17fba74232584d90cb721a89b7ad277220627cc97054ba15a98ea8f","impliedFormat":1},{"version":"24bd580b5743dc56402c440dc7f9a4f5d592ad7a419f25414d37a7bfe11e342b","impliedFormat":1},{"version":"25c8056edf4314820382a5fdb4bb7816999acdcb929c8f75e3f39473b87e85bc","impliedFormat":1},{"version":"c464d66b20788266e5353b48dc4aa6bc0dc4a707276df1e7152ab0c9ae21fad8","impliedFormat":1},{"version":"78d0d27c130d35c60b5e5566c9f1e5be77caf39804636bc1a40133919a949f21","impliedFormat":1},{"version":"c6fd2c5a395f2432786c9cb8deb870b9b0e8ff7e22c029954fabdd692bff6195","impliedFormat":1},{"version":"1d6e127068ea8e104a912e42fc0a110e2aa5a66a356a917a163e8cf9a65e4a75","impliedFormat":1},{"version":"5ded6427296cdf3b9542de4471d2aa8d3983671d4cac0f4bf9c637208d1ced43","impliedFormat":1},{"version":"6bdc71028db658243775263e93a7db2fd2abfce3ca569c3cca5aee6ed5eb186d","impliedFormat":1},{"version":"cadc8aced301244057c4e7e73fbcae534b0f5b12a37b150d80e5a45aa4bebcbd","impliedFormat":1},{"version":"385aab901643aa54e1c36f5ef3107913b10d1b5bb8cbcd933d4263b80a0d7f20","impliedFormat":1},{"version":"9670d44354bab9d9982eca21945686b5c24a3f893db73c0dae0fd74217a4c219","impliedFormat":1},{"version":"0b8a9268adaf4da35e7fa830c8981cfa22adbbe5b3f6f5ab91f6658899e657a7","impliedFormat":1},{"version":"11396ed8a44c02ab9798b7dca436009f866e8dae3c9c25e8c1fbc396880bf1bb","impliedFormat":1},{"version":"ba7bc87d01492633cb5a0e5da8a4a42a1c86270e7b3d2dea5d156828a84e4882","impliedFormat":1},{"version":"4893a895ea92c85345017a04ed427cbd6a1710453338df26881a6019432febdd","impliedFormat":1},{"version":"c21dc52e277bcfc75fac0436ccb75c204f9e1b3fa5e12729670910639f27343e","impliedFormat":1},{"version":"13f6f39e12b1518c6650bbb220c8985999020fe0f21d818e28f512b7771d00f9","impliedFormat":1},{"version":"9b5369969f6e7175740bf51223112ff209f94ba43ecd3bb09eefff9fd675624a","impliedFormat":1},{"version":"4fe9e626e7164748e8769bbf74b538e09607f07ed17c2f20af8d680ee49fc1da","impliedFormat":1},{"version":"24515859bc0b836719105bb6cc3d68255042a9f02a6022b3187948b204946bd2","impliedFormat":1},{"version":"ea0148f897b45a76544ae179784c95af1bd6721b8610af9ffa467a518a086a43","impliedFormat":1},{"version":"24c6a117721e606c9984335f71711877293a9651e44f59f3d21c1ea0856f9cc9","impliedFormat":1},{"version":"dd3273ead9fbde62a72949c97dbec2247ea08e0c6952e701a483d74ef92d6a17","impliedFormat":1},{"version":"405822be75ad3e4d162e07439bac80c6bcc6dbae1929e179cf467ec0b9ee4e2e","impliedFormat":1},{"version":"0db18c6e78ea846316c012478888f33c11ffadab9efd1cc8bcc12daded7a60b6","impliedFormat":1},{"version":"e61be3f894b41b7baa1fbd6a66893f2579bfad01d208b4ff61daef21493ef0a8","impliedFormat":1},{"version":"bd0532fd6556073727d28da0edfd1736417a3f9f394877b6d5ef6ad88fba1d1a","impliedFormat":1},{"version":"89167d696a849fce5ca508032aabfe901c0868f833a8625d5a9c6e861ef935d2","impliedFormat":1},{"version":"615ba88d0128ed16bf83ef8ccbb6aff05c3ee2db1cc0f89ab50a4939bfc1943f","impliedFormat":1},{"version":"a4d551dbf8746780194d550c88f26cf937caf8d56f102969a110cfaed4b06656","impliedFormat":1},{"version":"8bd86b8e8f6a6aa6c49b71e14c4ffe1211a0e97c80f08d2c8cc98838006e4b88","impliedFormat":1},{"version":"317e63deeb21ac07f3992f5b50cdca8338f10acd4fbb7257ebf56735bf52ab00","impliedFormat":1},{"version":"4732aec92b20fb28c5fe9ad99521fb59974289ed1e45aecb282616202184064f","impliedFormat":1},{"version":"2e85db9e6fd73cfa3d7f28e0ab6b55417ea18931423bd47b409a96e4a169e8e6","impliedFormat":1},{"version":"c46e079fe54c76f95c67fb89081b3e399da2c7d109e7dca8e4b58d83e332e605","impliedFormat":1},{"version":"bf67d53d168abc1298888693338cb82854bdb2e69ef83f8a0092093c2d562107","impliedFormat":1},{"version":"81184fe8e67d78ac4e5374650f0892d547d665d77da2b2f544b5d84729c4a15d","affectsGlobalScope":true,"impliedFormat":1},{"version":"f52e8dacc97d71dcc96af29e49584353f9c54cb916d132e3e768d8b8129c928d","impliedFormat":1},{"version":"7394959e5a741b185456e1ef5d64599c36c60a323207450991e7a42e08911419","impliedFormat":1},{"version":"76103716ba397bbb61f9fa9c9090dca59f39f9047cb1352b2179c5d8e7f4e8d0","impliedFormat":1},{"version":"53eac70430b30089a3a1959d8306b0f9cfaf0de75224b68ef25243e0b5ad1ca3","affectsGlobalScope":true,"impliedFormat":1},{"version":"4314c7a11517e221f7296b46547dbc4df047115b182f544d072bdccffa57fc72","impliedFormat":1},{"version":"115971d64632ea4742b5b115fb64ed04bcaae2c3c342f13d9ba7e3f9ee39c4e7","impliedFormat":1},{"version":"c2510f124c0293ab80b1777c44d80f812b75612f297b9857406468c0f4dafe29","affectsGlobalScope":true,"impliedFormat":1},{"version":"a40826e8476694e90da94aa008283a7de50d1dafd37beada623863f1901cb7fb","impliedFormat":1},{"version":"86956cc2eb9dd371d6fab493d326a574afedebf76eef3fa7833b8e0d9b52d6f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"24642567d3729bcc545bacb65ee7c0db423400c7f1ef757cab25d05650064f98","impliedFormat":1},{"version":"e6f5a38687bebe43a4cef426b69d34373ef68be9a6b1538ec0a371e69f309354","impliedFormat":1},{"version":"a6bf63d17324010ca1fbf0389cab83f93389bb0b9a01dc8a346d092f65b3605f","impliedFormat":1},{"version":"e009777bef4b023a999b2e5b9a136ff2cde37dc3f77c744a02840f05b18be8ff","impliedFormat":1},{"version":"1e0d1f8b0adfa0b0330e028c7941b5a98c08b600efe7f14d2d2a00854fb2f393","impliedFormat":1},{"version":"ee1ee365d88c4c6c0c0a5a5701d66ebc27ccd0bcfcfaa482c6e2e7fe7b98edf7","affectsGlobalScope":true,"impliedFormat":1},{"version":"875928df2f3e9a3aed4019539a15d04ff6140a06df6cd1b2feb836d22a81eaca","affectsGlobalScope":true,"impliedFormat":1},{"version":"e9ad08a376ac84948fcca0013d6f1d4ae4f9522e26b91f87945b97c99d7cc30b","impliedFormat":1},{"version":"eaf9ee1d90a35d56264f0bf39842282c58b9219e112ac7d0c1bce98c6c5da672","impliedFormat":1},{"version":"c15c4427ae7fd1dcd7f312a8a447ac93581b0d4664ddf151ecd07de4bf2bb9d7","impliedFormat":1},{"version":"5135bdd72cc05a8192bd2e92f0914d7fc43ee077d1293dc622a049b7035a0afb","impliedFormat":1},{"version":"4f80de3a11c0d2f1329a72e92c7416b2f7eab14f67e92cac63bb4e8d01c6edc8","impliedFormat":1},{"version":"6d386bc0d7f3afa1d401afc3e00ed6b09205a354a9795196caed937494a713e6","impliedFormat":1},{"version":"75c3400359d59fae5aed4c4a59fcd8a9760cf451e25dc2174cb5e08b9d4803e2","affectsGlobalScope":true,"impliedFormat":1},{"version":"94c4187083503a74f4544503b5a30e2bd7af0032dc739b0c9a7ce87f8bddc7b9","impliedFormat":1},{"version":"b1b6ee0d012aeebe11d776a155d8979730440082797695fc8e2a5c326285678f","impliedFormat":1},{"version":"45875bcae57270aeb3ebc73a5e3fb4c7b9d91d6b045f107c1d8513c28ece71c0","impliedFormat":1},{"version":"3eb62baae4df08c9173e6903d3ca45942ccec8c3659b0565684a75f3292cffbb","affectsGlobalScope":true,"impliedFormat":1},{"version":"a85683ef86875f4ad4c6b7301bbcc63fb379a8d80d3d3fd735ee57f48ef8a47e","affectsGlobalScope":true,"impliedFormat":1},{"version":"3f16a7e4deafa527ed9995a772bb380eb7d3c2c0fd4ae178c5263ed18394db2c","impliedFormat":1},{"version":"c6b4e0a02545304935ecbf7de7a8e056a31bb50939b5b321c9d50a405b5a0bba","impliedFormat":1},{"version":"fab29e6d649aa074a6b91e3bdf2bff484934a46067f6ee97a30fcd9762ae2213","impliedFormat":1},{"version":"8145e07aad6da5f23f2fcd8c8e4c5c13fb26ee986a79d03b0829b8fce152d8b2","impliedFormat":1},{"version":"e1120271ebbc9952fdc7b2dd3e145560e52e06956345e6fdf91d70ca4886464f","impliedFormat":1},{"version":"15c5e91b5f08be34a78e3d976179bf5b7a9cc28dc0ef1ffebffeb3c7812a2dca","impliedFormat":1},{"version":"a8f06c2382a30b7cb89ad2dfc48fc3b2b490f3dafcd839dadc008e4e5d57031d","impliedFormat":1},{"version":"553870e516f8c772b89f3820576152ebc70181d7994d96917bb943e37da7f8a7","impliedFormat":1},{"version":"37ba7b45141a45ce6e80e66f2a96c8a5ab1bcef0fc2d0f56bb58df96ec67e972","impliedFormat":1},{"version":"93452d394fdd1dc551ec62f5042366f011a00d342d36d50793b3529bfc9bd633","impliedFormat":1},{"version":"745c4240220559bd340c8aeb6e3c5270a709d3565e934dc22a69c304703956bc","affectsGlobalScope":true,"impliedFormat":1},{"version":"2754d8221d77c7b382096651925eb476f1066b3348da4b73fe71ced7801edada","impliedFormat":1},{"version":"9212c6e9d80cb45441a3614e95afd7235a55a18584c2ed32d6c1aca5a0c53d93","affectsGlobalScope":true,"impliedFormat":1},{"version":"bef91efa0baea5d0e0f0f27b574a8bc100ce62a6d7e70220a0d58af6acab5e89","affectsGlobalScope":true,"impliedFormat":1},{"version":"282fd2a1268a25345b830497b4b7bf5037a5e04f6a9c44c840cb605e19fea841","impliedFormat":1},{"version":"5360a27d3ebca11b224d7d3e38e3e2c63f8290cb1fcf6c3610401898f8e68bc3","impliedFormat":1},{"version":"66ba1b2c3e3a3644a1011cd530fb444a96b1b2dfe2f5e837a002d41a1a799e60","impliedFormat":1},{"version":"7e514f5b852fdbc166b539fdd1f4e9114f29911592a5eb10a94bb3a13ccac3c4","impliedFormat":1},{"version":"7d6ff413e198d25639f9f01f16673e7df4e4bd2875a42455afd4ecc02ef156da","affectsGlobalScope":true,"impliedFormat":1},{"version":"6bd91a2a356600dee28eb0438082d0799a18a974a6537c4410a796bab749813c","affectsGlobalScope":true,"impliedFormat":1},{"version":"f689c4237b70ae6be5f0e4180e8833f34ace40529d1acc0676ab8fb8f70457d7","impliedFormat":1},{"version":"ae25afbbf1ed5df63a177d67b9048bf7481067f1b8dc9c39212e59db94fc9fc6","impliedFormat":1},{"version":"ac5ed35e649cdd8143131964336ab9076937fa91802ec760b3ea63b59175c10a","impliedFormat":1},{"version":"52a8e7e8a1454b6d1b5ad428efae3870ffc56f2c02d923467f2940c454aa9aec","affectsGlobalScope":true,"impliedFormat":1},{"version":"78dc0513cc4f1642906b74dda42146bcbd9df7401717d6e89ea6d72d12ecb539","impliedFormat":1},{"version":"171fd8807643c46a9d17e843959abdf10480d57d60d38d061fb44a4c8d4a8cc4","impliedFormat":1}],"root":[46],"options":{"allowJs":true,"alwaysStrict":true,"declaration":true,"emitDeclarationOnly":true,"emitDecoratorMetadata":true,"esModuleInterop":true,"experimentalDecorators":true,"importHelpers":true,"module":1,"noEmitHelpers":true,"noImplicitAny":false,"removeComments":true,"skipLibCheck":true,"strict":true,"target":1},"referencedMap":[[48,1],[49,2],[50,1],[95,3],[96,3],[97,4],[98,5],[99,6],[100,7],[51,2],[54,8],[52,2],[53,2],[101,9],[102,10],[103,11],[104,12],[105,13],[106,14],[107,14],[109,15],[108,16],[110,17],[111,18],[112,19],[94,20],[113,21],[114,22],[115,23],[116,24],[117,25],[118,26],[119,27],[120,28],[121,29],[122,30],[123,31],[124,32],[125,33],[126,33],[127,34],[128,2],[129,2],[130,35],[132,36],[131,37],[133,38],[134,39],[135,40],[136,41],[137,42],[138,43],[139,44],[56,45],[55,2],[148,46],[140,47],[141,48],[142,49],[143,50],[144,51],[145,52],[146,53],[147,54],[47,2],[44,2],[45,2],[8,2],[10,2],[9,2],[2,2],[11,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[3,2],[19,2],[4,2],[20,2],[24,2],[21,2],[22,2],[23,2],[25,2],[26,2],[27,2],[5,2],[28,2],[29,2],[30,2],[31,2],[6,2],[35,2],[32,2],[33,2],[34,2],[36,2],[7,2],[37,2],[42,2],[43,2],[38,2],[39,2],[40,2],[41,2],[1,2],[72,55],[82,56],[71,55],[92,57],[63,58],[62,59],[91,60],[85,61],[90,62],[65,63],[79,64],[64,65],[88,66],[60,67],[59,60],[89,68],[61,69],[66,70],[67,2],[70,70],[57,2],[93,71],[83,72],[74,73],[75,74],[77,75],[73,76],[76,77],[86,60],[68,78],[69,79],[78,80],[58,81],[81,72],[80,70],[84,2],[87,82],[46,81]],"version":"5.6.3"} \ No newline at end of file diff --git a/typings/index.d.ts b/typings/index.d.ts index 0a15241c6..315fef284 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -76,7 +76,7 @@ export type NumberArray = number | NumberArray[]; /** - * Callback used to return results in synchronous Aerospike database operations + * Callback used to return results in synchronous Aerospike database commands */ export type TypedCallback = (error?: AerospikeError, result?: T) => void; @@ -317,7 +317,7 @@ export class AerospikeRecord { } /** - * Multi-record transaction (MRT) class. Each command in the MRT must use the same namespace. + * Transaction class. Each command in a transaction must use the same namespace. * * note: By default, open transactions are destroyed when the final client in a process is closed. * If you need your transaction to persist after the last client has been closed, provide `false` for the @@ -350,12 +350,12 @@ export class AerospikeRecord { * let key = new Aerospike.Key('test', 'demo', 'myKey') * * let policy = { - * txn: mrt + * txn: tran * }; * ;(async () => { * let client = await Aerospike.connect(config) - * let mrt = new Aerospike.Transaction() + * let tran = new Aerospike.Transaction() * * @@ -363,7 +363,7 @@ export class AerospikeRecord { * * let get_result = await client.get(key1, policy) * - * let result = await client.commit(mrt) + * let result = await client.commit(tran) * await client.close() * })(); * @@ -391,20 +391,20 @@ export class AerospikeRecord { * let client = await Aerospike.connect(config) * * const policy = { - * txn: mrt + * txn: tran * } * * await client.put(key4, record2, meta, policy) * * const policyRead = { - * txn: mrt + * txn: tran * } * * let get_result = await client.get(key1, policy) // Will reflect the new value recently put. * * await client.put(key2, record2, meta, policy) * - * let result = await client.abort(mrt) + * let result = await client.abort(tran) * * get_result = await client.get(key4) // Will reset to the value present before transaction started. * @@ -447,7 +447,7 @@ export class Transaction { /** - * Default multi-record transaction capacity values. + * Default Transaction capacity values. */ static capacity: { /** @@ -462,7 +462,7 @@ export class Transaction { }; /** - * Multi-record transaction abort status code. + * Transaction abort status code. */ static abortStatus: { /** @@ -489,7 +489,7 @@ export class Transaction { /** - * Multi-record transaction commit status code. + * Transaction commit status code. */ static commitStatus: { /** @@ -532,8 +532,6 @@ export class Transaction { * * @remarks * - * - * * Use of this API is only necessary when the client is closed with * the destroyTransactions parameter set is set to false. * See example below for usage details. @@ -556,18 +554,18 @@ export class Transaction { * } * * ;(async () => { - * let mrt1 = new Aerospike.Transaction() + * let tran1 = new Aerospike.Transaction() * let client = await Aerospike.connect(config) - * client.close(false, true) // `destroyTransactions is true`, mrt1 is no longer usable. + * client.close(false, true) // `destroyTransactions is true`, tran1 is no longer usable. * - * let mrt2 = new Aerospike.Transaction() + * let tran2 = new Aerospike.Transaction() * client = await Aerospike.connect(config) - * client.close(false, true) // `destroyTransactions is false`, mrt2 can still be used. + * client.close(false, true) // `destroyTransactions is false`, tran2 can still be used. * * // In order to properly manage the memory at this point, do one of two things before the process exits: * * // 1: call destroyAll() to destroy all outstanding transactions from this process. - * mrt1.destroyAll() + * tran1.destroyAll() * * // 2: reopen and close the final connected client with destroyTransactions * // client = await Aerospike.connect(config) @@ -581,7 +579,7 @@ export class Transaction { /** * Get ID for this transaction * - * @returns MRT ID + * @returns Transaction ID * * @example * @@ -599,8 +597,8 @@ export class Transaction { * * ;(async () => { * // Establishes a connection to the server - * let mrt = new Aerospike.Transaction() - * let id = mrt.getId() + * let tran = new Aerospike.Transaction() + * let id = tran.getId() * })(); * * @since v6.0.0 @@ -610,7 +608,7 @@ export class Transaction { /** * Get inDoubt status for this transaction. * - * @returns MRT inDoubt status + * @returns Transaction inDoubt status * * @example * @@ -628,8 +626,8 @@ export class Transaction { * * ;(async () => { * // Establishes a connection to the server - * let mrt = new Aerospike.Transaction() - * let inDoubt = mrt.getInDoubt() + * let tran = new Aerospike.Transaction() + * let inDoubt = tran.getInDoubt() * })(); * * @since v6.0.0 @@ -637,9 +635,9 @@ export class Transaction { public getInDoubt(): boolean; /** * - * Gets the expected number of record reads in the MRT. Minimum value is 16. + * Gets the expected number of record reads in the Transaction. Minimum value is 16. * - * @returns number of records reads in the MRT. + * @returns number of records reads in the Transaction. * * @example * @@ -657,8 +655,8 @@ export class Transaction { * * ;(async () => { * // Establishes a connection to the server - * let mrt = new Aerospike.Transaction() - * let readsCapacity = mrt.getReadsCapacity() + * let tran = new Aerospike.Transaction() + * let readsCapacity = tran.getReadsCapacity() * console.log(readsCapacity) // 128 * })(); * @@ -667,9 +665,9 @@ export class Transaction { public getReadsCapacity(): number; /** * - * Gets the current state of the MRT. + * Gets the current state of the Transaction. * - * @returns MRT timeout in seconds + * @returns Transaction timeout in seconds * * @example * @@ -687,8 +685,8 @@ export class Transaction { * * ;(async () => { * // Establishes a connection to the server - * let mrt = new Aerospike.Transaction() - * let state = mrt.getState() + * let tran = new Aerospike.Transaction() + * let state = tran.getState() * * })(); * @@ -696,9 +694,9 @@ export class Transaction { public getState(): number; /** * - * Gets the current MRT timeout value. + * Gets the current Transaction timeout value. * - * @returns MRT timeout in seconds + * @returns Transaction timeout in seconds * * @example * @@ -716,8 +714,8 @@ export class Transaction { * * ;(async () => { * // Establishes a connection to the server - * let mrt = new Aerospike.Transaction() - * let timeout = mrt.getTimeout() + * let tran = new Aerospike.Transaction() + * let timeout = tran.getTimeout() * })(); * * @since v6.0.0 @@ -725,9 +723,9 @@ export class Transaction { public getTimeout(): number; /** * - * Gets the expected number of record reads in the MRT. Minimum value is 16. + * Gets the expected number of record reads in the tran. Minimum value is 16. * - * @returns number of records reads in the MRT. + * @returns number of records reads in the tran. * * @example * @@ -745,8 +743,8 @@ export class Transaction { * * ;(async () => { * // Establishes a connection to the server - * let mrt = new Aerospike.Transaction() - * let writesCapacity = mrt.getWritesCapacity() + * let tran = new Aerospike.Transaction() + * let writesCapacity = tran.getWritesCapacity() * console.log(writesCapacity) // 128 * })(); * @@ -755,15 +753,15 @@ export class Transaction { public getWritesCapacity(): number; /** * - * Set MRT timeout in seconds. The timer starts when the MRT monitor record is created. This occurs when the first command in the MRT is executed. + * Set transaction timeout in seconds. The timer starts when the transaction monitor record is created. This occurs when the first command in the transaction is executed. * - * If the timeout is reached before a commit or abort is called, the server will expire and rollback the MRT. + * If the timeout is reached before a commit or abort is called, the server will expire and rollback the transaction. * - * If the MRT timeout is zero, the server configuration mrt-duration is used. The default mrt-duration is 10 seconds. + * If the transaction timeout is zero, the server configuration mrt-duration is used. The default mrt-duration is 10 seconds. * * Default Client transaction timeout is 0. * - * @param timeout - MRT timeout in seconds + * @param timeout - Transaction timeout in seconds * * @example * @@ -781,10 +779,10 @@ export class Transaction { * * ;(async () => { * // Establishes a connection to the server - * let mrt = new Aerospike.Transaction() - * mrt.setTimeout(5) // Set timeout for 5 seconds! + * let tran = new Aerospike.Transaction() + * tran.setTimeout(5) // Set timeout for 5 seconds! * - * console.log(mrt.getTimeout()) // 5 + * console.log(tran.getTimeout()) // 5 * })(); * */ @@ -827,15 +825,16 @@ export class BatchResult { */ public constructor(status: typeof statusNamespace[keyof typeof statusNamespace], record: AerospikeRecord, inDoubt: boolean); /** - * Database operation status code assoicated with the batch result. + * Result code for this returned record. If not {@link statusNamespace.AEROSPIKE_OK|AEROSPIKE_OK}, the record will be null. */ status: typeof statusNamespace[keyof typeof statusNamespace]; /** - * Aerospike Record result from a batch operation. + * Record result for the requested key. This record will only be populated when the result is + * {@link statusNamespace.AEROSPIKE_OK|AEROSPIKE_OK} or {@link statusNamespace.AEROSPIKE_ERR_UDF|AEROSPIKE_ERR_UDF}. */ record: AerospikeRecord; /** - * It is possible that a write transaction completed even though the client + * It is possible that a write command completed even though the client * returned this error. This may be the case when a client error occurs * (like timeout) after the command was sent to the server. */ @@ -844,7 +843,7 @@ export class BatchResult { } /** - * Aerospike Query operations perform value-based searches using + * Aerospike Query commands perform value-based searches using * secondary indexes (SI). A Query object, created by calling {@link Client#query}, * is used to execute queries on the specified namespace and set (optional). * Queries can return a set of records as a {@link RecordStream} or be @@ -856,7 +855,7 @@ export class BatchResult { * in the Aerospike technical documentation. * * To scan _all_ records in a database namespace or set, it is more efficient - * to use {@link Scan operations}, which provide more fine-grained control over + * to use {@link Scan.operate}, which provide more fine-grained control over * execution priority, concurrency, etc. * * #### SI Filters @@ -1296,9 +1295,9 @@ export class Query { * For aggregation queries that return a single result value instead of a * stream of values, you should use the {@link Query#apply} method instead. * - * @param policy - The Query Policy to use for this operation. + * @param policy - The Query Policy to use for this command. * @param dataCb - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. * @param errorCb - Callback function called when there is an error. * @param endCb - Callback function called when an operation has completed. @@ -1322,7 +1321,7 @@ export class Query { * of records to be queried if {@link Query.foreach} or {@link Query.results} is called. * * - * @param policy - The Query Policy to use for this operation. + * @param policy - The Query Policy to use for this command. * * @returns A promise that resolves with an Aerospike Record. */ @@ -1335,7 +1334,7 @@ export class Query { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Query Policy to use for this operation. + * @param policy - The Query Policy to use for this command. * * @returns A promise that resolves with an Aerospike bin value. * @@ -1344,7 +1343,7 @@ export class Query { /** * @param udfModule - UDF module name. * @param udfFunction - UDF function name. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * */ public apply(udfModule: string, udfFunction: string, callback: TypedCallback): void; @@ -1352,7 +1351,7 @@ export class Query { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * */ public apply(udfModule: string, udfFunction: string, udfArgs?: AerospikeBinValue[] | null, callback?: TypedCallback): void; @@ -1360,8 +1359,8 @@ export class Query { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Query Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Query Policy to use for this command. + * @param callback - The function to call when the command completes. * */ public apply(udfModule: string, udfFunction: string, udfArgs?: AerospikeBinValue[], policy?: policy.QueryPolicy | null, callback?: TypedCallback): void; @@ -1376,7 +1375,7 @@ export class Query { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Write Policy to use for this operation. + * @param policy - The Write Policy to use for this command. * @param queryID - Job ID to use for the query; will be assigned * randomly if zero or undefined. * @@ -1386,7 +1385,7 @@ export class Query { /** * @param udfModule - UDF module name. * @param udfFunction - UDF function name. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * */ public background(udfModule: string, udfFunction: string, callback: TypedCallback): void; @@ -1394,7 +1393,7 @@ export class Query { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * */ public background(udfModule: string, udfFunction: string, udfArgs?: AerospikeBinValue[] | null, callback?: TypedCallback): void; @@ -1402,8 +1401,8 @@ export class Query { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Write Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Write Policy to use for this command. + * @param callback - The function to call when the command completes. * */ public background(udfModule: string, udfFunction: string, udfArgs?: AerospikeBinValue[] | null, policy?: policy.WritePolicy | null, callback?: TypedCallback): void; @@ -1411,10 +1410,10 @@ export class Query { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Write Policy to use for this operation. + * @param policy - The Write Policy to use for this command. * @param queryID - Job ID to use for the query; will be assigned * randomly if zero or undefined. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * */ public background(udfModule: string, udfFunction: string, udfArgs?: AerospikeBinValue[] | null, policy?: policy.WritePolicy | null, queryID?: number | null, callback?: TypedCallback | null): void; @@ -1431,7 +1430,7 @@ export class Query { * * @param operations - List of write * operations to perform on the matching records. - * @param policy - The Query Policy to use for this operation. + * @param policy - The Query Policy to use for this command. * @param queryID - Job ID to use for the query; will be assigned * randomly if zero or undefined. * @@ -1456,7 +1455,7 @@ export class Query { /** * @param operations - List of write * operations to perform on the matching records. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * * @returns Promise that resolves to a Job instance. */ @@ -1464,8 +1463,8 @@ export class Query { /** * @param operations - List of write * operations to perform on the matching records. - * @param policy - The Query Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Query Policy to use for this command. + * @param callback - The function to call when the command completes. * * @returns Promise that resolves to a Job instance. */ @@ -1473,10 +1472,10 @@ export class Query { /** * @param operations - List of write * operations to perform on the matching records. - * @param policy - The Query Policy to use for this operation. + * @param policy - The Query Policy to use for this command. * @param queryID - Job ID to use for the query; will be assigned * randomly if zero or undefined. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * * @returns Promise that resolves to a Job instance. */ @@ -1661,14 +1660,14 @@ export class WritePolicy extends policy.WritePolicy {} /** * The policy module defines policies and policy values that - * define the behavior of database operations. Most {@link Client} methods, + * define the behavior of database commands. Most {@link Client} methods, * including scans and queries, accept a policy object, that affects how the - * database operation is executed, by specifying timeouts, transactional - * behavior, etc. Global defaults for specific types of database operations can + * database command is executed, by specifying timeouts, transactional + * behavior, etc. Global defaults for specific types of database commands can * also be set through the client config, when a new {@link Client} instance is * created. * - * Different policies apply to different types of database operations: + * Different policies apply to different types of database commands: * * * {@link ApplyPolicy} - Applies to {@link Client.apply}. * * {@link OperatePolicy} - Applies to {@link Client.operate} as well as {@link Client.append}, {@link Client.prepend} and {@link Client.add}. @@ -1679,7 +1678,7 @@ export class WritePolicy extends policy.WritePolicy {} * * {@link WritePolicy} - Applies to {@link Client.put}. * * {@link BatchPolicy} - Applies to {@link Client.batchRead} as well as the * deprecated {@link Client.batchExists}, {@link Client.batchGet}, and {@link - * Client.batchSelect} operations. Also used when providing batchParentWrite policy to a client configuration. + * Client.batchSelect} commands. Also used when providing batchParentWrite policy to a client configuration. * * {@link BatchApplyPolicy} - Applies to {@link Client.batchApply}. * * {@link BatchReadPolicy} - Applies to {@link Client.batchRead}. * * {@link BatchRemovePolicy} - Applies to {@link Client.batchRemove}. @@ -1701,7 +1700,7 @@ export class WritePolicy extends policy.WritePolicy {} * and {@link Client.setWhitelist}, . * * Base policy {@link BasePolicy} class which defines common policy - * values that apply to all database operations + * values that apply to all database commands * (except `InfoPolicy`, `AdminPolicy`, `MapPolicy` and `ListPolicy`). * * This module also defines global values for the following policy settings: @@ -1760,7 +1759,7 @@ export class WritePolicy extends policy.WritePolicy {} export namespace policy { /** - * A policy affecting the behavior of adminstraation operations. + * A policy affecting the behavior of adminstration commands. * * Please note that `AdminPolicy` does not derive from {@link BasePolicy}. * @@ -1768,7 +1767,7 @@ export namespace policy { */ export class AdminPolicy extends BasePolicy { /** - * Maximum time in milliseconds to wait for the operation to complete. + * Maximum time in milliseconds to wait for the command to complete. * * @type number */ @@ -1788,7 +1787,7 @@ export namespace policy { export class ApplyPolicy extends BasePolicy { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -1797,7 +1796,7 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -1848,7 +1847,7 @@ export namespace policy { public compress?: boolean; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. * * expression filters can only be applied to the following commands: @@ -1866,15 +1865,15 @@ export namespace policy { */ public filterExpression?: AerospikeExp; /** - * Maximum number of retries before aborting the current transaction. + * Maximum number of retries before aborting the current command. * The initial attempt is not counted as a retry. * - * If maxRetries is exceeded, the transaction will return + * If maxRetries is exceeded, the command will return * error {@link statusNamespace.ERR_TIMEOUT|ERR_TIMEOUT}. * * WARNING: Database writes that are not idempotent (such as "add") - * should not be retried because the write operation may be performed - * multiple times if the client timed out previous transaction attempts. + * should not be retried because the write command may be performed + * multiple times if the client timed out previous command attempts. * It is important to use a distinct write policy for non-idempotent * writes which sets maxRetries to zero. * @@ -1887,7 +1886,7 @@ export namespace policy { * If socketTimeout is not zero and the socket has been idle * for at least socketTimeout, both maxRetries * and totalTimeout are checked. If maxRetries - * and totalTimeout are not exceeded, the transaction is + * and totalTimeout are not exceeded, the command is * retried. * * If both socketTimeout and totalTimeout are @@ -1900,15 +1899,15 @@ export namespace policy { */ public socketTimeout?: number; /** - * Total transaction timeout in milliseconds. + * Total command timeout in milliseconds. * * The totalTimeout is tracked on the client and sent to the - * server along with the transaction in the wire protocol. The client will + * server along with the command in the wire protocol. The client will * most likely timeout first, but the server also has the capability to - * timeout the transaction. + * timeout the command * * If totalTimeout is not zero and totalTimeout - * is reached before the transaction completes, the transaction will return + * is reached before the command completes, the command will return * error {@link statusNamespace.ERR_TIMEOUT|ERR_TIMEOUT}. * If totalTimeout is zero, there will be no total time limit. * @@ -1916,7 +1915,7 @@ export namespace policy { */ public totalTimeout?: number; /** - * Multi-record command identifier. See {@link Transaction} for more information. + * Transaction identifier. See {@link Transaction} for more information. * * @default null (no transaction) */ @@ -1932,14 +1931,14 @@ export namespace policy { /** - * A policy affecting the behavior of batch apply operations. + * A policy affecting the behavior of batch apply commands. * * @since v5.0.0 */ export class BatchApplyPolicy { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -1948,14 +1947,14 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ public durableDelete?: boolean; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. */ public filterExpression?: AerospikeExp; @@ -2007,7 +2006,7 @@ export namespace policy { * * Values: * false: Issue batch commands sequentially. This mode has a performance advantage for small - * to medium sized batch sizes because commands can be issued in the main transaction thread. + * to medium sized batch sizes because commands can be issued in the main command thread. * This is the default. * true: Issue batch commands in parallel threads. This mode has a performance * advantage for large batch sizes because each node can process the command immediately. @@ -2100,7 +2099,7 @@ export namespace policy { export class BatchReadPolicy { /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. */ public filterExpression?: AerospikeExp; @@ -2142,7 +2141,7 @@ export namespace policy { export class BatchRemovePolicy { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -2151,14 +2150,14 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ public durableDelete?: boolean; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. * */ @@ -2189,14 +2188,14 @@ export namespace policy { } /** - * A policy affecting the behavior of batch write operations. + * A policy affecting the behavior of batch write commands. * * @since v5.0.0 */ export class BatchWritePolicy { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -2205,7 +2204,7 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -2218,7 +2217,7 @@ export namespace policy { public exists?: policy.exists; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. */ public filterExpression?: AerospikeExp; @@ -2247,7 +2246,7 @@ export namespace policy { } /** - * A policy affecting the behavior of {@link bitwise|bitwise} operations. + * A policy affecting the behavior of {@link bitwise|bitwise} commands. * * @since v3.13.0 */ @@ -2364,7 +2363,7 @@ export namespace policy { } /** - * A policy affecting the behavior of {@link hll|HLL} operations. + * A policy affecting the behavior of {@link hll|HLL} commands. * * @since v3.16.0 */ @@ -2385,7 +2384,7 @@ export namespace policy { } /** - * A policy affecting the behavior of info operations. + * A policy affecting the behavior of info commands. * * Please note that `InfoPolicy` does not derive from {@link BasePolicy} and that * info commands do not support automatic retry. @@ -2402,7 +2401,7 @@ export namespace policy { */ public sendAsIs?: boolean; /** - * Maximum time in milliseconds to wait for the operation to complete. + * Maximum time in milliseconds to wait for the command to complete. */ public timeout?: number /** @@ -2492,14 +2491,14 @@ export namespace policy { } /** - * A policy affecting the behavior of operate operations. + * A policy affecting the behavior of operations. * * @since v3.0.0 */ export class OperatePolicy extends BasePolicy { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -2516,7 +2515,7 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -2582,7 +2581,7 @@ export namespace policy { /** - * A policy affecting the behavior of query operations. + * A policy affecting the behavior of query commands. * * @since v3.0.0 */ @@ -2625,21 +2624,21 @@ export namespace policy { */ public infoTimeout?: number; /** - * Specifies the replica to be consulted for the query operation. + * Specifies the replica to be consulted for the query command. * * @see {@link policy.replica} for supported policy values. */ public replica?: policy.replica; /** - * Total transaction timeout in milliseconds. + * Total command timeout in milliseconds. * * The totalTimeout is tracked on the client and sent to the - * server along with the transaction in the wire protocol. The client will + * server along with the command in the wire protocol. The client will * most likely timeout first, but the server also has the capability to - * timeout the transaction. + * timeout the command * * If totalTimeout is not zero and totalTimeout - * is reached before the transaction completes, the transaction will return + * is reached before the command completes, the command will return * error {@link status.ERR_TIMEOUT | ERR_TIMEOUT}. * If totalTimeout is zero, there will be no total time limit. * @@ -2656,7 +2655,7 @@ export namespace policy { } /** - * A policy affecting the behavior of read operations. + * A policy affecting the behavior of read commands. * * @since v3.0.0 */ @@ -2709,7 +2708,7 @@ export namespace policy { */ public readTouchTtlPercent?: number; /** - * Specifies the replica to be consulted for the read operation. + * Specifies the replica to be consulted for the read command. * * @type number * @see {@link policy.replica} for supported policy values. @@ -2725,14 +2724,14 @@ export namespace policy { } /** - * A policy affecting the behavior of remove operations. + * A policy affecting the behavior of remove commands. * * @since v3.0.0 */ export class RemovePolicy extends BasePolicy { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -2741,7 +2740,7 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -2771,7 +2770,7 @@ export namespace policy { } /** - * A policy affecting the behavior of scan operations. + * A policy affecting the behavior of scan commands. * * @since v3.0.0 */ @@ -2780,7 +2779,7 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -2810,21 +2809,21 @@ export namespace policy { */ public recordsPerSecond?: number; /** - * Specifies the replica to be consulted for the scan operation. + * Specifies the replica to be consulted for the scan command. * * @see {@link policy.replica} for supported policy values. */ public replica?: policy.replica; /** - * Total transaction timeout in milliseconds. + * Total command timeout in milliseconds. * * The totalTimeout is tracked on the client and sent to the - * server along with the transaction in the wire protocol. The client will + * server along with the command in the wire protocol. The client will * most likely timeout first, but the server also has the capability to - * timeout the transaction. + * timeout the command * * If totalTimeout is not zero and totalTimeout - * is reached before the transaction completes, the transaction will return + * is reached before the command completes, the command will return * error {@link status.ERR_TIMEOUT | ERR_TIMEOUT}. * If totalTimeout is zero, there will be no total time limit. * @@ -2842,14 +2841,14 @@ export namespace policy { /** - * A policy affecting the behavior of write operations. + * A policy affecting the behavior of write commands. * * @since v3.0.0 */ export class WritePolicy extends BasePolicy { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -2864,7 +2863,7 @@ export namespace policy { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -2903,7 +2902,7 @@ export namespace policy { /** * Specifies the number of replicas required to be successfully committed - * before returning success in a write operation to provide the desired + * before returning success in a write command to provide the desired * consistency guarantee. */ export enum commitLevel { @@ -2949,7 +2948,7 @@ export namespace policy { * @remarks To use the EQ or GT generation policy * (see below), the generation value to use for the comparison needs to be * specified in the metadata parameter (meta) of the {@link - * Client#put} operation. + * Client#put} command. * * * @example Update record, only if generation matches @@ -2969,7 +2968,7 @@ export namespace policy { * * const record = await client.get(key) * const gen = record.gen // Current generation of the record. (1 for new record.) - * // Perform some operation using record. Some other process might update the + * // Perform some command using record. Some other process might update the * // record in the meantime, which would change the generation value. * if (Math.random() < 0.1) await client.put(key, { foo: 'fox' }) * @@ -3022,7 +3021,7 @@ export namespace policy { * the server. This policy causes a write operation to store the key. Once the * key is stored, the server will keep it - there is no need to use this policy * on subsequent updates of the record. If this policy is used on read or - * delete operations, or on subsequent updates of a record with a stored key, + * delete commands, or on subsequent updates of a record with a stored key, * the key sent will be compared with the key stored on the server. A mismatch * will cause ERR_RECORD_KEY_MISMATCH to be returned. */ @@ -3159,7 +3158,7 @@ export namespace policy { /** * The Aerospike Node.js client enables you to build an application in Node.js or Typescript with an Aerospike cluster as its database. - * The client manages the connections to the cluster and handles the transactions performed against it. + * The client manages the connections to the cluster and handles the commands performed against it. */ export class Client extends EventEmitter { /** @@ -3254,10 +3253,10 @@ export class Client extends EventEmitter { * * @param keys - An array of keys, used to locate the records in the cluster. * @param udf - Server UDF module/function and argList to apply. - * @param batchPolicy - The Batch Policy to use for this operation. + * @param batchPolicy - The Batch Policy to use for this command. * @param batchApplyPolicy - UDF policy configuration parameters. * - * @returns A Promise that resolves to the results of the batch operation. + * @returns A Promise that resolves to the results of the batched command. * * * @@ -3328,26 +3327,26 @@ export class Client extends EventEmitter { * @param keys - An array of keys, used to locate the records in the cluster. * @param udf - Server UDF module/function and argList to apply. * @param callback - The function to call when - * the operation completes. Includes the results of the batch operation. + * the command completes. Includes the results of the batched command. * */ public batchApply(keys: KeyOptions[], udf: UDF, callback?: TypedCallback): void; /** * @param keys - An array of keys, used to locate the records in the cluster. * @param udf - Server UDF module/function and argList to apply. - * @param batchPolicy - The Batch Policy to use for this operation. + * @param batchPolicy - The Batch Policy to use for this command. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. * */ public batchApply(keys: KeyOptions[], udf: UDF, batchPolicy?: policy.BatchPolicy, callback?: TypedCallback): void; /** * @param keys - An array of keys, used to locate the records in the cluster. * @param udf - Server UDF module/function and argList to apply. - * @param batchPolicy - The Batch Policy to use for this operation. + * @param batchPolicy - The Batch Policy to use for this command. * @param batchApplyPolicy - UDF policy configuration parameters. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. * */ public batchApply(keys: KeyOptions[], udf: UDF, batchPolicy?: policy.BatchPolicy, batchApplyPolicy?: policy.BatchApplyPolicy, callback?: TypedCallback): void; @@ -3356,9 +3355,9 @@ export class Client extends EventEmitter { * Checks the existence of a batch of records from the database cluster. * * @param keys - An array of Keys used to locate the records in the cluster. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * - * @returns A Promise that resolves to the results of the batch operation. + * @returns A Promise that resolves to the results of the batched command. * * @deprecated since v2.0 - use {@link Client#batchRead} instead. * @@ -3417,14 +3416,14 @@ export class Client extends EventEmitter { /** * @param keys - An array of Keys used to locate the records in the cluster. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchExists(keys: KeyOptions[], callback: TypedCallback): void; /** * @param keys - An array of Keys used to locate the records in the cluster. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchExists(keys: KeyOptions[], policy: policy.BatchPolicy | null , callback: TypedCallback): void; @@ -3438,9 +3437,9 @@ export class Client extends EventEmitter { * the batch. This method requires server >= 3.6.0. * * @param records - List of {@link BatchReadRecord} instances which each contain keys and bins to retrieve. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * - * @returns {?Promise} - A Promise that resolves to the results of the batch operation. + * @returns {?Promise} - A Promise that resolves to the results of the batched command. * * @since v2.0 * @@ -3511,14 +3510,14 @@ export class Client extends EventEmitter { /** * @param records - List of {@link BatchReadRecord} instances which each contain keys and bins to retrieve. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchRead(records: BatchReadRecord[], callback?: TypedCallback): void; /** * @param records - List of {@link BatchReadRecord} instances which each contain keys and bins to retrieve. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchRead(records: BatchReadRecord[], policy?: policy.BatchPolicy | null, callback?: TypedCallback): void; /** @@ -3526,9 +3525,9 @@ export class Client extends EventEmitter { * Reads a batch of records from the database cluster. * * @param keys - An array of {@link Key | Keys}, used to locate the records in the cluster. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * - * @returns {?Promise} - A Promise that resolves to the results of the batch operation. + * @returns {?Promise} - A Promise that resolves to the results of the batched command. * * @deprecated since v2.0 - use {@link Client#batchRead} instead. * @@ -3587,15 +3586,15 @@ export class Client extends EventEmitter { * * @param keys - An array of {@link Key | Keys}, used to locate the records in the cluster. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchGet(keys: KeyOptions[], callback: TypedCallback): void; /** * * @param keys - An array of {@link Key | Keys}, used to locate the records in the cluster. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchGet(keys: KeyOptions[], policy: policy.BatchPolicy | null, callback: TypedCallback): void; /** @@ -3607,10 +3606,10 @@ export class Client extends EventEmitter { * This method requires server >= 6.0.0. * * @param keys - {@link Key} An array of keys, used to locate the records in the cluster. - * @param batchPolicy - The Batch Policy to use for this operation. + * @param batchPolicy - The Batch Policy to use for this command. * @param batchRemovePolicy Remove policy configuration parameters. * - * @returns A Promise that resolves to the results of the batch operation. + * @returns A Promise that resolves to the results of the batched command. * * @since v5.0.0 * @@ -3667,22 +3666,22 @@ export class Client extends EventEmitter { /** * @param keys - {@link Key} An array of keys, used to locate the records in the cluster. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchRemove(keys: KeyOptions[], callback?: TypedCallback): void; /** * @param keys - {@link Key} An array of keys, used to locate the records in the cluster. - * @param batchPolicy - The Batch Policy to use for this operation. + * @param batchPolicy - The Batch Policy to use for this command. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchRemove(keys: KeyOptions[], batchPolicy?: policy.BatchPolicy | null, callback?: TypedCallback): void; /** * @param keys - {@link Key} An array of keys, used to locate the records in the cluster. - * @param batchPolicy - The Batch Policy to use for this operation. + * @param batchPolicy - The Batch Policy to use for this command. * @param batchRemovePolicy Remove policy configuration parameters. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchRemove(keys: KeyOptions[], batchPolicy?: policy.BatchPolicy | null, batchRemovePolicy?: policy.BatchRemovePolicy | null, callback?: TypedCallback): void; @@ -3692,10 +3691,10 @@ export class Client extends EventEmitter { * * @param keys - An array of keys, used to locate the records in the cluster. * @param bins - An array of bin names for the bins to be returned for the given keys. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * * @returns {?Promise} - If no callback function is passed, the function - * returns a Promise that resolves to the results of the batch operation. + * returns a Promise that resolves to the results of the batched command. * * @deprecated since v2.0 - use {@link Client#batchRead} instead. * @@ -3757,15 +3756,15 @@ export class Client extends EventEmitter { * @param keys - An array of keys, used to locate the records in the cluster. * @param bins - An array of bin names for the bins to be returned for the given keys. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchSelect(keys: KeyOptions[], bins: string[], callback: TypedCallback): void; /** * @param keys - An array of keys, used to locate the records in the cluster. * @param bins - An array of bin names for the bins to be returned for the given keys. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * @param callback - The function to call when - * the operation completes, with the results of the batch operation. + * the command completes, with the results of the batched command. */ public batchSelect(keys: KeyOptions[], bins: string[], policy: policy.BatchPolicy, callback: TypedCallback): void; /** @@ -3775,7 +3774,7 @@ export class Client extends EventEmitter { * This method requires server >= 6.0.0. * * @param records - List of {@link BatchWriteRecord} instances which each contain keys and bins to retrieve. - * @param policy - The Batch Policy to use for this operation. + * @param policy - The Batch Policy to use for this command. * * @since v6.0.0 * @@ -3887,13 +3886,13 @@ export class Client extends EventEmitter { public batchWrite(records: BatchWriteRecord[], policy?: policy.BatchPolicy | null): Promise; /** * @param records - List of {@link BatchWriteRecord} instances which each contain keys and bins to retrieve. - * @param callback - The function to call when the operation completes, Includes the results of the batch operation. + * @param callback - The function to call when the command completes, Includes the results of the batched command. */ public batchWrite(records: BatchWriteRecord[], callback?: TypedCallback): void; /** * @param records - List of {@link BatchWriteRecord} instances which each contain keys and bins to retrieve. - * @param policy - The Batch Policy to use for this operation. - * @param callback - The function to call when the operation completes, Includes the results of the batch operation. + * @param policy - The Batch Policy to use for this command. + * @param callback - The function to call when the command completes, Includes the results of the batched command. */ public batchWrite(records: BatchWriteRecord[], policy?: policy.BatchPolicy, callback?: TypedCallback): void; /** @@ -4031,7 +4030,7 @@ export class Client extends EventEmitter { * // Put record with bin containing the serialized record * await client.put(contextKey, {context: serializedContext}) * - * // Get context when needed for operation + * // Get context when needed for command * let contextRecord = await client.get(contextKey) * * // Deserialize CDT Context @@ -4056,7 +4055,7 @@ export class Client extends EventEmitter { * with the datatype option set to Aerospike.indexDataType.BLOB. * * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns {?Promise} - A Promise that will resolve to an {@link IndexJob} instance. * @@ -4090,13 +4089,13 @@ export class Client extends EventEmitter { public createBlobIndex(options: IndexOptions, policy?: policy.InfoPolicy | null): Promise; /** * @param options - Options for creating the index. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public createBlobIndex(options: IndexOptions, callback: TypedCallback): void; /** * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Info Policy to use for this command. + * @param callback - The function to call when the command completes. */ public createBlobIndex(options: IndexOptions, policy: policy.InfoPolicy | null, callback: TypedCallback): void; /** @@ -4139,7 +4138,7 @@ export class Client extends EventEmitter { * will be returned. * * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that will resolve to an {@link IndexJob} instance. * @@ -4196,13 +4195,13 @@ export class Client extends EventEmitter { public createIndex(options: IndexOptions, policy?: policy.InfoPolicy | null): Promise; /** * @param options - Options for creating the index. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public createIndex(options: IndexOptions, callback: TypedCallback): void; /** * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Info Policy to use for this command. + * @param callback - The function to call when the command completes. */ public createIndex(options: IndexOptions, policy: policy.InfoPolicy | null, callback: TypedCallback): void; /** @@ -4212,7 +4211,7 @@ export class Client extends EventEmitter { * with the datatype option set to Aerospike.indexDataType.NUMERIC. * * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns {?Promise} - A Promise that will resolve to an {@link IndexJob} instance. * @@ -4247,15 +4246,15 @@ export class Client extends EventEmitter { public createIntegerIndex(options: IndexOptions, policy?: policy.InfoPolicy | null): Promise; /** * @param options - Options for creating the index. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. * * @returns {?Promise} - A Promise that will resolve to an {@link IndexJob} instance. */ public createIntegerIndex(options: IndexOptions, callback: TypedCallback): void; /** * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Info Policy to use for this command. + * @param callback - The function to call when the command completes. * * @returns {?Promise} - A Promise that will resolve to an {@link IndexJob} instance. */ @@ -4267,7 +4266,7 @@ export class Client extends EventEmitter { * with the datatype option set to Aerospike.indexDataType.STRING. * * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns {?Promise} - A Promise that will resolve to an {@link IndexJob} instance. * @@ -4302,13 +4301,13 @@ export class Client extends EventEmitter { public createStringIndex(options: IndexOptions, policy?: policy.InfoPolicy): Promise; /** * @param options - Options for creating the index. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public createStringIndex(options: IndexOptions, callback: TypedCallback): void; /** * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Info Policy to use for this command. + * @param callback - The function to call when the command completes. */ public createStringIndex(options: IndexOptions, policy: policy.InfoPolicy, callback: TypedCallback): void; /** @@ -4318,7 +4317,7 @@ export class Client extends EventEmitter { * with the datatype option set to Aerospike.indexDataType.GEO2DSPHERE. * * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns {?Promise} - A Promise that will resolve to an {@link IndexJob} instance. * @@ -4352,13 +4351,13 @@ export class Client extends EventEmitter { public createGeo2DSphereIndex(options: IndexOptions, policy?: policy.InfoPolicy): Promise; /** * @param options - Options for creating the index. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public createGeo2DSphereIndex(options: IndexOptions, callback: TypedCallback): void; /** * @param options - Options for creating the index. - * @param policy - The Info Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Info Policy to use for this command. + * @param callback - The function to call when the command completes. */ public createGeo2DSphereIndex(options: IndexOptions, policy: policy.InfoPolicy, callback: TypedCallback): void; /** @@ -4376,7 +4375,7 @@ export class Client extends EventEmitter { * * @param key - The key, used to locate the record in the cluster. * @param udfArgs - Parameters used to specify which UDF function to execute. - * @param policy - The Apply Policy to use for this operation. + * @param policy - The Apply Policy to use for this command. * * @returns {?Promise} A Promise that resolves to the value returned by the UDF. * @@ -4425,7 +4424,7 @@ export class Client extends EventEmitter { /** * @param key - The key, used to locate the record in the cluster. * @param udfArgs - Parameters used to specify which UDF function to execute. - * @param policy - The Apply Policy to use for this operation. + * @param policy - The Apply Policy to use for this command. * @param callback - This function will be called with the * result returned by the Record UDF function call. */ @@ -4464,20 +4463,20 @@ export class Client extends EventEmitter { * let client = await Aerospike.connect(config) * * const policy = { - * txn: mrt + * txn: tran * } * * await client.put(key4, record2, meta, policy) * * const policyRead = { - * txn: mrt + * txn: tran * } * * let get_result = await client.get(key1, policy) // Will reflect the new value recently put. * * await client.put(key2, record2, meta, policy) * - * let result = await client.abort(mrt) + * let result = await client.abort(tran) * * get_result = await client.get(key4) // Will reset to the value present before transaction started. * @@ -4533,12 +4532,12 @@ export class Client extends EventEmitter { * let key2 = new Aerospike.Key('test', 'demo', 'myKey2') * * let policy = { - * txn: mrt + * txn: tran * }; * ;(async () => { * let client = await Aerospike.connect(config) - * let mrt = new Aerospike.Transaction() + * let tran = new Aerospike.Transaction() * * @@ -4546,7 +4545,7 @@ export class Client extends EventEmitter { * await client.put(key2, bins, meta, policy) * let get_result = await client.get(key1, policy) * - * let result = await client.commit(mrt) + * let result = await client.commit(tran) * await client.close() * })(); */ @@ -4564,7 +4563,7 @@ export class Client extends EventEmitter { * Checks the existance of a record in the database cluster. * * @param key - The key of the record to check for existance. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * * @returns {?Promise} A Promise that resolves to true if the record exists or * false otherwise. @@ -4599,15 +4598,15 @@ export class Client extends EventEmitter { /** * @param key - The key of the record to check for existance. * @param callback - The function to call when the - * operation completes; the passed value is true if the record + * command completes; the passed value is true if the record * exists or false otherwise. */ public exists(key: KeyOptions, callback: TypedCallback): void; /** * @param key - The key of the record to check for existance. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * @param callback - The function to call when the - * operation completes; the passed value is true if the record + * command completes; the passed value is true if the record * exists or false otherwise. */ public exists(key: KeyOptions, policy: policy.ReadPolicy | null, callback: TypedCallback): void; @@ -4615,7 +4614,7 @@ export class Client extends EventEmitter { * Checks the existance of a record in the database cluster. * * @param key - The key of the record to check for existance. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * * @returns A Promise that resolves to an {@link AerospikeRecord} containing no bins and a {@link RecordMetadata} object. * If the metadata contains data, the record exists. If the metadata contains null values, then the record does not exist. @@ -4650,15 +4649,15 @@ export class Client extends EventEmitter { /** * @param key - The key of the record to check for existance. * @param callback - The function to call when the - * operation completes; An {@link AerospikeRecord} will be passed to the callback, containing no bins and a {@link RecordMetadata} object. + * command completes; An {@link AerospikeRecord} will be passed to the callback, containing no bins and a {@link RecordMetadata} object. * If the metadata contains data, the record exists. If the metadata contains null values, then the record does not exist. */ public existsWithMetadata(key: KeyOptions, callback: TypedCallback): void; /** * @param key - The key of the record to check for existance. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * @param callback - The function to call when the - * operation completes; An {@link AerospikeRecord} will be passed to the callback, containing no bins and a {@link RecordMetadata} object. + * command completes; An {@link AerospikeRecord} will be passed to the callback, containing no bins and a {@link RecordMetadata} object. * If the metadata contains data, the record exists. If the metadata contains null values, then the record does not exist. */ public existsWithMetadata(key: KeyOptions, policy: policy.ReadPolicy, callback: TypedCallback): void; @@ -4666,7 +4665,7 @@ export class Client extends EventEmitter { * Using the key provided, reads a record from the database cluster. * * @param key - The key used to locate the record in the cluster. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * * @returns A Promise that resolves to a {@link Record}. * @@ -4696,15 +4695,15 @@ export class Client extends EventEmitter { /** * @param key - The key used to locate the record in the cluster. * @param callback - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. */ public get(key: KeyOptions, callback: TypedCallback): void; /** * @param key - The key used to locate the record in the cluster. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * @param callback - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. */ public get(key: KeyOptions, policy: policy.ReadPolicy, callback: TypedCallback): void; @@ -4713,9 +4712,9 @@ export class Client extends EventEmitter { * * @param namespace - The namespace on which the index was created. * @param index - The name of the index. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * - * @returns {?Promise} A Promise that resolves once the operation completes. + * @returns {?Promise} A Promise that resolves once the command completes. * * @example * @@ -4737,15 +4736,15 @@ export class Client extends EventEmitter { * @param namespace - The namespace on which the index was created. * @param index - The name of the index. * @param callback - The function to call when the - * operation completes with the result of the operation. + * command completes with the result of the command. */ public indexRemove(namespace: string, index: string, callback: TypedCallback): void; /** * @param namespace - The namespace on which the index was created. * @param index - The name of the index. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this k. * @param callback - The function to call when the - * operation completes with the result of the operation. + * command completes with the result of the command. */ public indexRemove(namespace: string, index: string, policy: policy.InfoPolicy | null, callback: TypedCallback): void; /** @@ -4761,7 +4760,7 @@ export class Client extends EventEmitter { * * @param request - The info request to send. * @param host - See {@link Host}. The address of the cluster host to send the request to. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that resolves to an info result string. @@ -4798,7 +4797,7 @@ export class Client extends EventEmitter { /** * @param request - The info request to send. * @param host - See {@link Host}. The address of the cluster host to send the request to. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call when an info response from a cluster host is received. */ public info(request: string | undefined, host: Host | string, policy: policy.InfoPolicy | null, callback: TypedCallback): void; @@ -4810,7 +4809,7 @@ export class Client extends EventEmitter { * returned. * * @param request - The info request to send. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that resolves to an info result string. * @@ -4853,7 +4852,7 @@ export class Client extends EventEmitter { public infoAny(request?: string | undefined, callback?: TypedCallback): void; /** * @param request - The info request to send. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call once the node * returns the response to the info command; if no callback function is * provided, the method returns a Promise instead. @@ -4869,7 +4868,7 @@ export class Client extends EventEmitter { * returned. * * @param request - The info request to send. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that resolves to an {@link InfoAllResponse}. * @@ -4906,7 +4905,7 @@ export class Client extends EventEmitter { public infoAll(request?: string | undefined, callback?: TypedCallback): void; /** * @param request - The info request to send. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call once all nodes have * returned a response to the info command; if no callback function is * provided, the method returns a Promise instead. @@ -4921,7 +4920,7 @@ export class Client extends EventEmitter { * * @param request - The info request to send. * @param node - The node to send the request to. See {@link InfoNodeParam}. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that resolves to an info result string. * @@ -4962,7 +4961,7 @@ export class Client extends EventEmitter { /** * @param request - The info request to send. * @param node - The node to send the request to. See {@link InfoNodeParam}. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call once the node * returns the response to the info command; if no callback function is * provided, the method returns a Promise instead. @@ -4993,7 +4992,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param operations - List of {@link operations.Operation | Operations} to perform on the record. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * * @example * @@ -5033,7 +5032,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param operations - List of {@link operations.Operation | Operations} to perform on the record. * @param callback - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. */ public operate(key: KeyOptions, operations: operations.Operation[], callback: TypedCallback): void; @@ -5042,7 +5041,7 @@ export class Client extends EventEmitter { * @param operations - List of {@link operations.Operation | Operations} to perform on the record. * @param metadata - Meta data. * @param callback - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. */ public operate(key: KeyOptions, operations: operations.Operation[], metadata: RecordMetadata, callback: TypedCallback): void; @@ -5050,9 +5049,9 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param operations - List of {@link operations.Operation | Operations} to perform on the record. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * @param callback - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. */ public operate(key: KeyOptions, operations: operations.Operation[], metadata: RecordMetadata | null, policy: policy.OperatePolicy | null, callback: TypedCallback): void; @@ -5070,7 +5069,7 @@ export class Client extends EventEmitter { * either string or byte array values and the values to append must be of the * same type. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * * @returns A Promise that resolves to the results of the opertion. * @@ -5085,7 +5084,7 @@ export class Client extends EventEmitter { * either string or byte array values and the values to append must be of the * same type. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public append(key: KeyOptions, bins: AerospikeBins, callback: TypedCallback): void; /** @@ -5096,7 +5095,7 @@ export class Client extends EventEmitter { * same type. * @param metadata - Meta data. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public append(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, callback: TypedCallback): void; /** @@ -5106,9 +5105,9 @@ export class Client extends EventEmitter { * either string or byte array values and the values to append must be of the * same type. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public append(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, policy: policy.OperatePolicy | null, callback: TypedCallback): void; /** @@ -5118,7 +5117,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to prepend to the bin value. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * * @returns A Promise that resolves to the results of the opertion. * @@ -5130,7 +5129,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to prepend to the bin value. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public prepend(key: KeyOptions, bins: AerospikeBins, callback: TypedCallback): void; /** @@ -5138,16 +5137,16 @@ export class Client extends EventEmitter { * @param bins - The key-value mapping of bin names and the corresponding values to prepend to the bin value. * @param metadata - Meta data. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public prepend(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, callback: TypedCallback): void; /** * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to prepend to the bin value. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public prepend(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, policy: policy.OperatePolicy | null, callback: TypedCallback): void; /** @@ -5156,7 +5155,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * * @returns A Promise that resolves to the results of the opertion. * @@ -5170,14 +5169,14 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public add(key: KeyOptions, bins: AerospikeBins, callback: TypedCallback): void; /** * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public add(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, callback: TypedCallback): void; /** @@ -5185,7 +5184,7 @@ export class Client extends EventEmitter { * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param metadata - Meta data. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. */ public add(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, policy: policy.OperatePolicy | null, callback: TypedCallback): void; /** @@ -5195,7 +5194,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * * @returns A Promise that resolves to the results of the opertion. */ @@ -5207,7 +5206,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. * */ public incr(key: KeyOptions, bins: AerospikeBins, callback: TypedCallback): void; @@ -5219,7 +5218,7 @@ export class Client extends EventEmitter { * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param metadata - Meta data. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. * */ public incr(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, callback: TypedCallback): void; @@ -5230,9 +5229,9 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - The key-value mapping of bin names and the corresponding values to use to increment the bin values with. * @param metadata - Meta data. - * @param policy - The Operate Policy to use for this operation. + * @param policy - The Operate Policy to use for this command. * @param callback - The function to call when the - * operation completes with the results of the operation. + * command completes with the results of the command. * */ public incr(key: KeyOptions, bins: AerospikeBins, metadata: RecordMetadata | null, policy: policy.OperatePolicy | null, callback: TypedCallback): void; @@ -5251,7 +5250,7 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - A record object used for specifying the fields to store. * @param meta - Meta data. - * @param policy - The Write Policy to use for this operation. + * @param policy - The Write Policy to use for this command. * * @returns A Promise that resolves to a {@link Record}. @@ -5292,22 +5291,22 @@ export class Client extends EventEmitter { /** * @param key - The key of the record. * @param bins - A record object used for specifying the fields to store. - * @param callback - The function to call when the operation completes with the result of the operation. + * @param callback - The function to call when the command completes with the result of the command. */ public put(key: KeyOptions, bins: AerospikeBins | Map | Bin | AerospikeRecord, callback: TypedCallback): void; /** * @param key - The key of the record. * @param bins - A record object used for specifying the fields to store. * @param meta - Meta data. - * @param callback - The function to call when the operation completes with the result of the operation. + * @param callback - The function to call when the command completes with the result of the command. */ public put(key: KeyOptions, bins: AerospikeBins | Map | Bin | AerospikeRecord, meta: RecordMetadata | null, callback: TypedCallback): void; /** * @param key - The key of the record. * @param bins - A record object used for specifying the fields to store. * @param meta - Meta data. - * @param policy - The Write Policy to use for this operation. - * @param callback - The function to call when the operation completes with the result of the operation. + * @param policy - The Write Policy to use for this command. + * @param callback - The function to call when the command completes with the result of the command. */ public put(key: KeyOptions, bins: AerospikeBins | Map | Bin | AerospikeRecord, meta: RecordMetadata | null, policy: policy.WritePolicy | null, callback: TypedCallback): void; /** @@ -5343,7 +5342,7 @@ export class Client extends EventEmitter { * Removes a record with the specified key from the database cluster. * * @param key - The key of the record. - * @param policy - The Remove Policy to use for this operation. + * @param policy - The Remove Policy to use for this command. * * @returns A Promise that resolves to the {@link Key} of the removed record. @@ -5383,13 +5382,13 @@ export class Client extends EventEmitter { public remove(key: KeyOptions, policy?: policy.RemovePolicy | null): Promise; /** * @param key - The key of the record. - * @param callback - The function to call when the operation completes with the results of the operation. + * @param callback - The function to call when the command completes with the results of the command. */ public remove(key: KeyOptions, callback: TypedCallback): void; /** * @param key - The key of the record. - * @param policy - The Remove Policy to use for this operation. - * @param callback - The function to call when the operation completes with the results of the operation. + * @param policy - The Remove Policy to use for this command. + * @param callback - The function to call when the command completes with the results of the command. */ public remove(key: KeyOptions, policy: policy.RemovePolicy | null, callback: TypedCallback): void; /** @@ -5431,7 +5430,7 @@ export class Client extends EventEmitter { * * @param key - The key of the record. * @param bins - A list of bin names for the bins to be returned. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * * @returns A Promise that resolves to a {@link AerospikeRecord}. * @@ -5476,16 +5475,16 @@ export class Client extends EventEmitter { * @param key - The key of the record. * @param bins - A list of bin names for the bins to be returned. * @param callback - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. */ public select(key: KeyOptions, bins: string[], callback: TypedCallback): void; /** * @param key - The key of the record. * @param bins - A list of bin names for the bins to be returned. - * @param policy - The Read Policy to use for this operation. + * @param policy - The Read Policy to use for this command. * @param callback - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. */ public select(key: KeyOptions, bins: string[], policy: policy.ReadPolicy | null, callback: TypedCallback): void; @@ -5503,7 +5502,7 @@ export class Client extends EventEmitter { * update time. Units are in nanoseconds since unix epoch (1970-01-01). If * specified, the value must be before the current time. Pass in 0 to delete * all records in namespace/set regardless of last udpate time. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that resolves when the truncate is complete. * @@ -5539,7 +5538,7 @@ export class Client extends EventEmitter { * update time. Units are in nanoseconds since unix epoch (1970-01-01). If * specified, the value must be before the current time. Pass in 0 to delete * all records in namespace/set regardless of last udpate time. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. */ public truncate(ns: string, set: string | null, beforeNanos: number, policy: policy.InfoPolicy | null, callback: TypedCallback): void; /** @@ -5558,7 +5557,7 @@ export class Client extends EventEmitter { * @param udfType - Language of the UDF script. Lua is the default * and only supported scripting language for UDF modules at the moment; ref. * {@link language}. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that resolves to a {@link Job} instance. * @@ -5586,7 +5585,7 @@ export class Client extends EventEmitter { public udfRegister(udfPath: string, udfType?: language | null, policy?: policy.InfoPolicy | null): Promise; /** * @param udfPath - The file path to the Lua script to load into the server. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @returns A Promise that resolves to a {@link Job} instance. */ @@ -5594,7 +5593,7 @@ export class Client extends EventEmitter { /** * @param udfPath - The file path to the Lua script to load into the server. * @param callback - The function to call when the - * operation completes with the result of the operation. + * command completes with the result of the command. */ public udfRegister(udfPath: string, callback: TypedCallback): void; @@ -5604,14 +5603,14 @@ export class Client extends EventEmitter { * and only supported scripting language for UDF modules at the moment; ref. * {@link language}. * @param callback - The function to call when the - * operation completes with the result of the operation. + * command completes with the result of the command. */ public udfRegister(udfPath: string, udfType: language | null, callback: TypedCallback): void; /** * @param udfPath - The file path to the Lua script to load into the server. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call when the - * operation completes with the result of the operation. + * command completes with the result of the command. */ public udfRegister(udfPath: string, policy: policy.InfoPolicy | null, callback: TypedCallback): void; /** @@ -5619,9 +5618,9 @@ export class Client extends EventEmitter { * @param udfType - Language of the UDF script. Lua is the default * and only supported scripting language for UDF modules at the moment; ref. * {@link language}. - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call when the - * operation completes with the result of the operation. + * command completes with the result of the command. */ public udfRegister(udfPath: string, udfType: language | null, policy: policy.InfoPolicy | null, callback: TypedCallback): void; /** @@ -5673,7 +5672,7 @@ export class Client extends EventEmitter { * * @param udfModule - The basename of the UDF module, without the * local pathname but including the file extension (".lua"). - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @example * @@ -5701,16 +5700,16 @@ export class Client extends EventEmitter { * @param udfModule - The basename of the UDF module, without the * local pathname but including the file extension (".lua"). * @param callback - The function to call when the - * operation completes which the result of the operation. + * command completes with the result of the command. * */ public udfRemove(udfModule: string, callback: TypedCallback): void; /** * @param udfModule - The basename of the UDF module, without the * local pathname but including the file extension (".lua"). - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call when the - * operation completes which the result of the operation. + * command completes with the result of the command. * */ public udfRemove(udfModule: string, policy: policy.InfoPolicy, callback: TypedCallback): void; @@ -6520,7 +6519,7 @@ export class Config { /** * Maximum number of asynchronous connections allowed per server node. * - * New transactions will be rejected with an {@link + * New commands will be rejected with an {@link * status.ERR_NO_MORE_CONNECTIONS | ERR_NO_MORE_CONNECTIONS} * error if the limit would be exceeded. * * @@ -6533,9 +6532,9 @@ export class Config { * The counted error types are any error that causes the connection to close (socket errors and client timeouts), * server device overload and server timeouts. * - * The application should backoff or reduce the transaction load until `AEROSPIKE_MAX_ERROR_RATE` stops being returned. + * The application should backoff or reduce the command load until `AEROSPIKE_MAX_ERROR_RATE` stops being returned. * - * If the backoff algorithm has been activated, transactions will fail with {@link + * If the backoff algorithm has been activated, commands will fail with {@link * status.AEROSPIKE_MAX_ERROR_RATE | AEROSPIKE_MAX_ERROR_RATE} until the {@link errorRateWindow} has passed and the * error count has been reset. * @@ -6604,28 +6603,28 @@ export class Config { * * The configuration defines default policies for the * application. Policies define the behavior of the client, which can be - * global for all uses of a single type of operation, or local to a single - * use of an operation. + * global for all uses of a single type of command, or local to a single + * use of an command. * - * Each database operation accepts a policy for that operation as an + * Each database command accepts a policy for that command as an * argument. This is considered a local policy, and is a single use policy. * This local policy supersedes any global policy defined. * * If a value of the policy is not defined, then the rule is to fallback to - * the global policy for that operation. If the global policy for that - * operation is undefined, then the global default value will be used. + * the global policy for that command. If the global policy for that + * command is undefined, then the global default value will be used. * * If you find that you have behavior that you want every use of an - * operation to utilize, then you can specify the default policy as + * command to utilize, then you can specify the default policy as * {@link Config#policies}. * - * For example, the {@link Client#put} operation takes a {@link + * For example, the {@link Client#put} command takes a {@link * WritePolicy} parameter. If you find yourself setting the {@link * WritePolicy#key} policy value for every call to {@link Client.put}, then * you may find it beneficial to set the global {@link WritePolicy} in - * {@link Config#policies}, which all operations will use. + * {@link Config#policies}, which all write commands will use. * * - * @example Setting a default key policy for all write operations + * @example Setting a default key policy for all write commands * * const Aerospike = require('aerospike') * @@ -6893,7 +6892,7 @@ export class AerospikeError extends Error { */ readonly line?: number | null; /** - * It is possible that a write transaction completed even though the client + * It is possible that a write command completed even though the client * returned this error. This may be the case when a client error occurs * (like timeout) after the command was sent to the server. */ @@ -7237,7 +7236,7 @@ export class Job { */ public jobID: number; /** - * Database operation associated with the Job. `query` and `scan` are the possible values` + * Database command associated with the Job. `query` and `scan` are the possible values` */ public module: string; /** @@ -7266,7 +7265,7 @@ export class Job { * * Check the progress of a background job running on the database. * - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * * @return A Promise that resolves to the job info. * @@ -7308,7 +7307,7 @@ export class Job { */ public info(callback: TypedCallback): void; /** - * @param policy - The Info Policy to use for this operation. + * @param policy - The Info Policy to use for this command. * @param callback - The function to call with the job info response. */ public info(policy: policy.InfoPolicy, callback: TypedCallback): void; @@ -7360,8 +7359,8 @@ export class Job { * ###### Key Digests * In your application, you must specify the namespace, set and the key itself * to read and write records. When a key is sent to the database, the key value - * and its set are hashed into a 160-bit digest. When a database operation - * returns a key (e.g. Query or Scan operations) it might contain either the + * and its set are hashed into a 160-bit digest. When a database command + * returns a key (e.g. Query or Scan commands) it might contain either the * set and key value, or just the digest. * * @param ns - The Namespace to which the key belongs. @@ -7430,7 +7429,7 @@ export interface RecordMetadata { } /** - * Stream of database records (full or partial) returned by {@link Query} or {@link Scan} operations. + * Stream of database records (full or partial) returned by {@link Query} or {@link Scan} commands. * * @remarks *Note:* Record stream currently does not support Node.js' * Stream#pause and Stream#resume methods, i.e. it @@ -7440,7 +7439,7 @@ export interface RecordMetadata { * * #### Aborting a Query/Scan * - * A query or scan operation can be aborted by calling the {@link + * A query or scan command can be aborted by calling the {@link * RecordStream#abort} method at any time. It is no possible to continue a * record stream, once aborted. * @@ -7495,7 +7494,7 @@ export class RecordStream extends Stream { public readable: true; public _read(): void; /** - * Aborts the query/scan operation. + * Aborts the query/scan command. * * Once aborted, it is not possible to resume the stream. * @@ -7506,7 +7505,7 @@ export class RecordStream extends Stream { * @event 'data' * @param listener - Function executed when data is received. * Aerospike record incl. bins, key and meta data. - * Depending on the operation, all, some or no bin values will be returned. + * Depending on the command, all, some or no bin values will be returned. */ public on(event: 'data', listener: (record: AerospikeRecord) => void): this; /** @@ -7589,7 +7588,7 @@ export interface ScanOptions { * * #### Executing Record UDFs using Background Scans * - * Record UDFs perform operations on a single record such as updating records + * Record UDFs perform commands on a single record such as updating records * based on a set of parameters. Using {@link Scan#background} you can run a * Record UDF on the result set of a scan. Scans using Records UDFs are run * in the background on the server and do not return the records to the client. @@ -7888,7 +7887,7 @@ export class Scan { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Scan Policy to use for this operation. + * @param policy - The Scan Policy to use for this command. * @param scanID - Job ID to use for the scan; will be assigned * randomly if zero or undefined. * @@ -7899,7 +7898,7 @@ export class Scan { * * @param udfModule - UDF module name. * @param udfFunction - UDF function name. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public background(udfModule: string, udfFunction: string, callback: TypedCallback): void; /** @@ -7907,7 +7906,7 @@ export class Scan { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public background(udfModule: string, udfFunction: string, udfArgs: AerospikeBinValue[], callback: TypedCallback): void; /** @@ -7915,8 +7914,8 @@ export class Scan { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Scan Policy to use for this operation. - * @param callback - The function to call when the operation completes. + * @param policy - The Scan Policy to use for this command. + * @param callback - The function to call when the command completes. */ public background(udfModule: string, udfFunction: string, udfArgs: AerospikeBinValue[], policy: policy.ScanPolicy, callback: TypedCallback): void; /** @@ -7924,10 +7923,10 @@ export class Scan { * @param udfModule - UDF module name. * @param udfFunction - UDF function name. * @param udfArgs - Arguments for the function. - * @param policy - The Scan Policy to use for this operation. + * @param policy - The Scan Policy to use for this command. * @param scanID - Job ID to use for the scan; will be assigned * randomly if zero or undefined. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public background(udfModule: string, udfFunction: string, udfArgs: AerospikeBinValue[], policy: policy.ScanPolicy, scanID: number, callback: TypedCallback): void; /** @@ -7942,7 +7941,7 @@ export class Scan { * * @param operations - List of write * operations to perform on the matching records. - * @param policy - The Scan Policy to use for this operation. + * @param policy - The Scan Policy to use for this command. * @param scanID - Job ID to use for the scan; will be assigned * randomly if zero or undefined. * @@ -7975,10 +7974,10 @@ export class Scan { /** * @param operations - List of write * operations to perform on the matching records. - * @param policy - The Scan Policy to use for this operation. + * @param policy - The Scan Policy to use for this command. * @param scanID - Job ID to use for the scan; will be assigned * randomly if zero or undefined. - * @param callback - The function to call when the operation completes. + * @param callback - The function to call when the command completes. */ public operate(operations: operations.Operation[], policy: policy.ScanPolicy, scanID: number, callback: TypedCallback): void; /** @@ -7987,9 +7986,9 @@ export class Scan { * iterates through each partition, it returns the current version of each * record to the client. * - * @param policy - The Scan Policy to use for this operation. + * @param policy - The Scan Policy to use for this command. * @param dataCb - The function to call when the - * operation completes with the results of the operation; if no callback + * command completes with the results of the command; if no callback * function is provided, the method returns a Promise instead. * @param errorCb - Callback function called when there is an error. * @param endCb - Callback function called when an operation has completed. @@ -8253,7 +8252,7 @@ export function setupGlobalCommandQueue(policy: policy.CommandQueuePolicy): void */ export interface AdminPolicyOptions extends BasePolicyOptions { /** - * Maximum time in milliseconds to wait for the operation to complete. + * Maximum time in milliseconds to wait for the command to complete. * * @type number */ @@ -8266,7 +8265,7 @@ export interface AdminPolicyOptions extends BasePolicyOptions { export interface ApplyPolicyOptions extends BasePolicyOptions { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -8275,7 +8274,7 @@ export interface ApplyPolicyOptions extends BasePolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -8313,7 +8312,7 @@ export interface BasePolicyOptions { compress?: boolean; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. * * expression filters can only be applied to the following commands: @@ -8331,15 +8330,15 @@ export interface BasePolicyOptions { */ filterExpression?: AerospikeExp; /** - * Maximum number of retries before aborting the current transaction. + * Maximum number of retries before aborting the current command. * The initial attempt is not counted as a retry. * - * If maxRetries is exceeded, the transaction will return + * If maxRetries is exceeded, the command will return * error {@link statusNamespace.ERR_TIMEOUT|ERR_TIMEOUT}. * * WARNING: Database writes that are not idempotent (such as "add") - * should not be retried because the write operation may be performed - * multiple times if the client timed out previous transaction attempts. + * should not be retried because the write command may be performed + * multiple times if the client timed out previous command attempts. * It is important to use a distinct write policy for non-idempotent * writes which sets maxRetries to zero. * @@ -8352,7 +8351,7 @@ export interface BasePolicyOptions { * If socketTimeout is not zero and the socket has been idle * for at least socketTimeout, both maxRetries * and totalTimeout are checked. If maxRetries - * and totalTimeout are not exceeded, the transaction is + * and totalTimeout are not exceeded, the command is * retried. * * If both socketTimeout and totalTimeout are @@ -8365,15 +8364,15 @@ export interface BasePolicyOptions { */ socketTimeout?: number; /** - * Total transaction timeout in milliseconds. + * Total command timeout in milliseconds. * * The totalTimeout is tracked on the client and sent to the - * server along with the transaction in the wire protocol. The client will + * server along with the command in the wire protocol. The client will * most likely timeout first, but the server also has the capability to - * timeout the transaction. + * timeout the command * * If totalTimeout is not zero and totalTimeout - * is reached before the transaction completes, the transaction will return + * is reached before the command completes, the command will return * error {@link statusNamespace.ERR_TIMEOUT|ERR_TIMEOUT}. * If totalTimeout is zero, there will be no total time limit. * @@ -8381,7 +8380,7 @@ export interface BasePolicyOptions { */ totalTimeout?: number; /** - * Multi-record command identifier. See {@link Transaction} for more information. + * Transaction identifier. See {@link Transaction} for more information. * * @default null (no transaction) */ @@ -8395,7 +8394,7 @@ export interface BasePolicyOptions { export interface BatchApplyPolicyOptions { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -8404,14 +8403,14 @@ export interface BatchApplyPolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ durableDelete?: boolean; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. */ filterExpression?: AerospikeExp; @@ -8456,7 +8455,7 @@ export interface BatchPolicyOptions extends BasePolicyOptions { * * Values: * false: Issue batch commands sequentially. This mode has a performance advantage for small - * to medium sized batch sizes because commands can be issued in the main transaction thread. + * to medium sized batch sizes because commands can be issued in the main command thread. * This is the default. * true: Issue batch commands in parallel threads. This mode has a performance * advantage for large batch sizes because each node can process the command immediately. @@ -8544,7 +8543,7 @@ export interface BatchPolicyOptions extends BasePolicyOptions { export interface BatchReadPolicyOptions { /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. */ filterExpression?: AerospikeExp; @@ -8594,7 +8593,7 @@ export interface BatchReadRecord { */ ops?: operations.Operation[] /** - * The Batch Policy to use for this operation. + * The Batch Policy to use for this command. */ policy?: BatchPolicyOptions; /** @@ -8613,7 +8612,7 @@ export interface BatchReadRecord { export interface BatchRemovePolicyOptions { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -8622,14 +8621,14 @@ export interface BatchRemovePolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ durableDelete?: boolean; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. * */ @@ -8658,7 +8657,7 @@ export interface BatchRemovePolicyOptions { export interface BatchWritePolicyOptions { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -8667,7 +8666,7 @@ export interface BatchWritePolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -8680,7 +8679,7 @@ export interface BatchWritePolicyOptions { exists?: policy.exists; /** * Optional expression filter. If filter exp exists and evaluates to false, the - * transaction is ignored. This can be used to eliminate a client/server roundtrip + * command is ignored. This can be used to eliminate a client/server roundtrip * in some cases. */ filterExpression?: AerospikeExp; @@ -8707,7 +8706,7 @@ export interface BatchWritePolicyOptions { */ export interface BatchWriteRecord { /** - * Type of Batch operation + * Type of batched command */ type: batchType; /** @@ -8731,7 +8730,7 @@ export interface BatchWriteRecord { */ ops?: operations.Operation[] /** - * The Batch Policy to use for this operation. + * The Batch Policy to use for this command. */ policy?: BatchWritePolicyOptions; } @@ -8927,7 +8926,7 @@ export interface ConfigOptions { /** * Maximum number of asynchronous connections allowed per server node. * - * New transactions will be rejected with an {@link + * New commands will be rejected with an {@link * status.ERR_NO_MORE_CONNECTIONS | ERR_NO_MORE_CONNECTIONS} * error if the limit would be exceeded. * * @@ -8940,9 +8939,9 @@ export interface ConfigOptions { * The counted error types are any error that causes the connection to close (socket errors and client timeouts), * server device overload and server timeouts. * - * The application should backoff or reduce the transaction load until `AEROSPIKE_MAX_ERROR_RATE` stops being returned. + * The application should backoff or reduce the command load until `AEROSPIKE_MAX_ERROR_RATE` stops being returned. * - * If the backoff algorithm has been activated, transactions will fail with {@link + * If the backoff algorithm has been activated, commands will fail with {@link * status.AEROSPIKE_MAX_ERROR_RATE | AEROSPIKE_MAX_ERROR_RATE} until the {@link errorRateWindow} has passed and the * error count has been reset. * @@ -9011,28 +9010,28 @@ export interface ConfigOptions { * * The configuration defines default policies for the * application. Policies define the behavior of the client, which can be - * global for all uses of a single type of operation, or local to a single - * use of an operation. + * global for all uses of a single type of command, or local to a single + * use of an command. * - * Each database operation accepts a policy for that operation as an + * Each database command accepts a policy for that command as an * argument. This is considered a local policy, and is a single use policy. * This local policy supersedes any global policy defined. * * If a value of the policy is not defined, then the rule is to fallback to - * the global policy for that operation. If the global policy for that - * operation is undefined, then the global default value will be used. + * the global policy for that command. If the global policy for that + * command is undefined, then the global default value will be used. * * If you find that you have behavior that you want every use of an - * operation to utilize, then you can specify the default policy as + * command to utilize, then you can specify the default policy as * {@link Config#policies}. * - * For example, the {@link Client#put} operation takes a {@link + * For example, the {@link Client#put} command takes a {@link * WritePolicy} parameter. If you find yourself setting the {@link * WritePolicy#key} policy value for every call to {@link Client.put}, then * you may find it beneficial to set the global {@link WritePolicy} in - * {@link Config#policies}, which all operations will use. - * * - * @example Setting a default key policy for all write operations + * {@link Config#policies}, which all commands will use. + * + * @example Setting a default key policy for all write commands * * const Aerospike = require('aerospike') * @@ -9180,29 +9179,29 @@ export interface ConfigOptions { * * @remarks The configuration defines default policies for the * application. Policies define the behavior of the client, which can be - * global for all uses of a single type of operation, or local to a single - * use of an operation. + * global for all uses of a single type of command, or local to a single + * use of an command. * - * Each database operation accepts a policy for that operation as an + * Each database command accepts a policy for that command as an * argument. This is considered a local policy, and is a single use policy. * This local policy supersedes any global policy defined. * * If a value of the policy is not defined, then the rule is to fallback to - * the global policy for that operation. If the global policy for that - * operation is undefined, then the global default value will be used. + * the global policy for that command. If the global policy for that + * command is undefined, then the global default value will be used. * * If you find that you have behavior that you want every use of an - * operation to utilize, then you can specify the default policy as + * command to utilize, then you can specify the default policy as * {@link Config#policies}. * - * For example, the {@link Client#put} operation takes a {@link + * For example, the {@link Client#put} command takes a {@link * WritePolicy} parameter. If you find yourself setting the {@link * WritePolicy#key} policy value for every call to {@link Client.put}, then * you may find it beneficial to set the global {@link WritePolicy} in - * {@link Config#policies}, which all operations will use. + * {@link Config#policies}, which all commands will use. * * - * @example Setting a default key policy for all write operations + * @example Setting a default key policy for all write commands * * const Aerospike = require('aerospike') * @@ -9285,7 +9284,7 @@ export interface ConnectionStats { inPool: number; /** * Connections actively being - * used in database transactions for this node. + * used in database commands for this node. */ inUse: number; /** @@ -9348,8 +9347,8 @@ export interface Host { * ###### Key Digests * In your application, you must specify the namespace, set and the key itself * to read and write records. When a key is sent to the database, the key value - * and its set are hashed into a 160-bit digest. When a database operation - * returns a key (e.g. Query or Scan operations) it might contain either the + * and its set are hashed into a 160-bit digest. When a database command + * returns a key (e.g. Query or Scan commands) it might contain either the * set and key value, or just the digest. * * @example Creating a new {@link Key} instance @@ -9467,7 +9466,7 @@ export interface InfoPolicyOptions extends BasePolicyOptions { */ sendAsIs?: boolean; /** - * Maximum time in milliseconds to wait for the operation to complete. + * Maximum time in milliseconds to wait for the command to complete. */ timeout?: number } @@ -9607,7 +9606,7 @@ export interface NodeStats { export interface OperatePolicyOptions extends BasePolicyOptions { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -9624,7 +9623,7 @@ export interface OperatePolicyOptions extends BasePolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -9675,7 +9674,7 @@ export interface OperatePolicyOptions extends BasePolicyOptions { */ readTouchTtlPercent?: number; /** - * Specifies the replica to be consulted for the read operation. + * Specifies the replica to be consulted for the read command. * * @see {@link policy.replica} for supported policy values. */ @@ -9911,21 +9910,21 @@ export interface QueryPolicyOptions extends BasePolicyOptions { */ infoTimeout?: number; /** - * Specifies the replica to be consulted for the query operation. + * Specifies the replica to be consulted for the query command. * * @see {@link policy.replica} for supported policy values. */ replica?: policy.replica; /** - * Total transaction timeout in milliseconds. + * Total command timeout in milliseconds. * * The totalTimeout is tracked on the client and sent to the - * server along with the transaction in the wire protocol. The client will + * server along with the command in the wire protocol. The client will * most likely timeout first, but the server also has the capability to - * timeout the transaction. + * timeout the command * * If totalTimeout is not zero and totalTimeout - * is reached before the transaction completes, the transaction will return + * is reached before the command completes, the command will return * error {@link status.ERR_TIMEOUT | ERR_TIMEOUT}. * If totalTimeout is zero, there will be no total time limit. * @@ -9986,7 +9985,7 @@ export interface ReadPolicyOptions extends BasePolicyOptions { */ readTouchTtlPercent?: number; /** - * Specifies the replica to be consulted for the read operation. + * Specifies the replica to be consulted for the read command. * * @type number * @see {@link policy.replica} for supported policy values. @@ -9999,7 +9998,7 @@ export interface ReadPolicyOptions extends BasePolicyOptions { export interface RemovePolicyOptions extends BasePolicyOptions { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -10008,7 +10007,7 @@ export interface RemovePolicyOptions extends BasePolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -10065,7 +10064,7 @@ export interface ScanPolicyOptions extends BasePolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -10095,21 +10094,21 @@ export interface ScanPolicyOptions extends BasePolicyOptions { */ recordsPerSecond?: number; /** - * Specifies the replica to be consulted for the scan operation. + * Specifies the replica to be consulted for the scan command. * * @see {@link policy.replica} for supported policy values. */ replica?: policy.replica; /** - * Total transaction timeout in milliseconds. + * Total command timeout in milliseconds. * * The totalTimeout is tracked on the client and sent to the - * server along with the transaction in the wire protocol. The client will + * server along with the command in the wire protocol. The client will * most likely timeout first, but the server also has the capability to - * timeout the transaction. + * timeout the command * * If totalTimeout is not zero and totalTimeout - * is reached before the transaction completes, the transaction will return + * is reached before the command completes, the command will return * error {@link status.ERR_TIMEOUT | ERR_TIMEOUT}. * If totalTimeout is zero, there will be no total time limit. * @@ -10301,7 +10300,7 @@ export interface UserOptions { * Current statistics by offset are: *
    *
  • 0: read quota in records per second
    • - *
  • 1: single record read transaction rate (TPS)
    • + *
  • 1: single record read command rate (TPS)
    • *
  • 2: read scan/query record per second rate (RPS)
    • *
  • 3: number of limitless read scans/queries
    • *
@@ -10313,7 +10312,7 @@ export interface UserOptions { * Current statistics by offset are: *
    *
  • 0: write quota in records per second
    • - *
  • 1: single record write transaction rate (TPS)
    • + *
  • 1: single record write command rate (TPS)
    • *
  • 2: write scan/query record per second rate (RPS)
    • *
  • 3: number of limitless write scans/queries
    • *
@@ -10332,7 +10331,7 @@ export interface UserOptions { export interface WritePolicyOptions extends BasePolicyOptions { /** * Specifies the number of replicas required to be committed successfully - * when writing before returning transaction succeeded. + * when writing before returning command succeeded. * * @see {@link policy.commitLevel} for supported policy values. */ @@ -10347,7 +10346,7 @@ export interface WritePolicyOptions extends BasePolicyOptions { * Specifies whether a {@link * http://www.aerospike.com/docs/guide/durable_deletes.html|tombstone} * should be written in place of a record that gets deleted as a result of - * this operation. + * this command. * * @default false (do not tombstone deleted records) */ @@ -10451,11 +10450,11 @@ export enum auth { */ export enum batchType { /** - * Indicates that a {@link Record} instance is used in a batch for read operations. + * Indicates that a {@link Record} instance is used in a batch for read commands. */ BATCH_READ, /** - * Indicates that a {@link Record} instance is used in a batch for write operations. + * Indicates that a {@link Record} instance is used in a batch for write commands. */ BATCH_WRITE, /** @@ -10463,15 +10462,15 @@ export enum batchType { */ BATCH_APPLY, /** - * Indicates that a {@link Record} instance is used in a batch for removal operations. + * Indicates that a {@link Record} instance is used in a batch for removal commands. */ BATCH_REMOVE, /** - * Indicates that a {@link Record} instance is used in a batch for transaction verfication operations. + * Indicates that a {@link Record} instance is used in a batch for transaction verfication commands. */ BATCH_TXN_VERIFY, /** - * Indicates that a {@link Record} instance is used in a batch for transaction rolling operations. + * Indicates that a {@link Record} instance is used in a batch for transaction rolling commands. */ BATCH_TXN_ROLL } @@ -10663,7 +10662,7 @@ export enum regex { */ export enum ttl { /** - * Use the default TTL value specified in {@link policy} for a given operation type. + * Use the default TTL value specified in {@link policy} for a given command type. */ CLIENT_DEFAULT = -3, /** @@ -10697,16 +10696,17 @@ export namespace admin { */ constructor(code: privilegeCode, options?: PrivilegeOptions); /** - * Permission code used to define the type of permission granted for a user's role. - * + * Privilege code used to define the permission granted for a user's role. */ code: privilegeCode; /** - * Namespace in which the Privilege will apply. + * Namespace scope. Apply permission to this namespace only. + * namespace is null, the privilege applies to all namespaces. */ namespace: string; /** - * Set in which the Privilege will apply + * Set scope. Apply permission to this set only. + * set is null, the privilege applies to all sets. */ set: string; } @@ -10726,19 +10726,19 @@ export namespace admin { */ name: string; /** - * Allowed number of read transactions per second. + * Maximum reads per second limit */ readQuota: number; /** - * Allowed number of write transactions per second. + * Maximum writes per second limit */ writeQuota: number; /** - * list of allowable IP addresses or null. IP addresses can contain wildcards (ie. 10.1.2.0/24). + * Array of allowable IP address strings. IP addresses can contain wildcards (ie. 10.1.2.0/24). */ whitelist: number[]; /** - * List of privileges granted to the role. For more info on Privileges: see {@link Privilege | here.} + * Array of assigned privileges. For more info on Privileges: see {@link Privilege | here.} */ privileges: Privilege[]; } @@ -10764,7 +10764,7 @@ export namespace admin { * List of read statistics. List may be null. Current statistics by offset are: * * 0: read quota in records per second - * 1: single record read transaction rate (TPS) + * 1: single record read command rate (TPS) * 2: read scan/query record per second rate (RPS) * 3: number of limitless read scans/queries * @@ -10775,7 +10775,7 @@ export namespace admin { * List of write statistics. List may be null. Current statistics by offset are: * * 0: write quota in records per second - * 1: single record write transaction rate (TPS) + * 1: single record write command rate (TPS) * 2: write scan/query record per second rate (RPS) * 3: number of limitless write scans/queries * @@ -10783,7 +10783,7 @@ export namespace admin { */ writeInfo: number[]; /** - * List of assigned roles. + * Array of assigned role names. */ roles: string[]; } @@ -15885,7 +15885,7 @@ export namespace operations { /** * This namespace provides functions to create secondary index (SI) filter - * predicates for use in query operations via the {@link Client#query} command. + * predicates for use in query commands via the {@link Client#query} command. * * @see {@link Query} * @@ -16083,27 +16083,27 @@ export namespace filter { declare namespace statusNamespace { /** - * Multi-record transaction commit called, but the transaction was already aborted. + * Transaction commit called, but the transaction was already aborted. */ export const AEROSPIKE_TXN_ALREADY_ABORTED = -19; /** - * Multi-record transaction commit called, but the transaction was already aborted. + * Transaction commit called, but the transaction was already aborted. */ export const TXN_ALREADY_ABORTED = -19; /** - * Multi-record transaction abort called, but the transaction was already committed. + * Transaction abort called, but the transaction was already committed. */ export const AEROSPIKE_TXN_ALREADY_COMMITTED = -18; /** - * Multi-record transaction abort called, but the transaction was already committed. + * Transaction abort called, but the transaction was already committed. */ export const TXN_ALREADY_COMMITTED = -18; /** - * Multi-record transaction failed. + * Transaction failed. */ export const AEROSPIKE_TXN_FAILED = -17; /** - * Multi-record transaction failed. + * Transaction failed. */ export const TXN_FAILED = -17; /** @@ -16401,11 +16401,11 @@ declare namespace statusNamespace { */ export const ERR_DEVICE_OVERLOAD = 18; /** - * Record key sent with transaction did not match key stored on server. + * Record key sent with command did not match key stored on server. */ export const AEROSPIKE_ERR_RECORD_KEY_MISMATCH = 19; /** - * Record key sent with transaction did not match key stored on server. + * Record key sent with command did not match key stored on server. */ export const ERR_RECORD_KEY_MISMATCH = 19; /** @@ -16469,12 +16469,12 @@ declare namespace statusNamespace { */ export const ERR_OP_NOT_APPLICABLE = 26; /** - * The transaction was not performed because the filter expression was + * The command was not performed because the filter expression was * false. */ export const AEROSPIKE_FILTERED_OUT = 27; /** - * The transaction was not performed because the filter expression was + * The command was not performed because the filter expression was * false. */ export const FILTERED_OUT = 27; @@ -16695,53 +16695,53 @@ x */ */ export const ERR_UDF = 100; /** - * MRT record blocked by a different transaction. + * Transaction record blocked by a different transaction. */ export const AEROSPIKE_MRT_BLOCKED = 120; /** - * MRT record blocked by a different transaction. + * Transaction record blocked by a different transaction. */ export const MRT_BLOCKED = 120; /** - * MRT read version mismatch identified during commit. + * Transaction read version mismatch identified during commit. * Some other command changed the record outside of the transaction. */ export const AEROSPIKE_MRT_VERSION_MISMATCH = 121; /** - * MRT read version mismatch identified during commit. + * Transaction read version mismatch identified during commit. * Some other command changed the record outside of the transaction. */ export const MRT_VERSION_MISMATCH = 121; /** - * MRT deadline reached without a successful commit or abort. + * Transaction deadline reached without a successful commit or abort. */ export const AEROSPIKE_MRT_EXPIRED = 122; /** - * MRT deadline reached without a successful commit or abort. + * Transaction deadline reached without a successful commit or abort. */ export const MRT_EXPIRED = 122; /** - * MRT write command limit (4096) exceeded. + * Transaction write command limit (4096) exceeded. */ export const AEROSPIKE_MRT_TOO_MANY_WRITES = 123; /** - * MRT write command limit (4096) exceeded. + * Transaction write command limit (4096) exceeded. */ export const MRT_TOO_MANY_WRITES = 123; /** - * MRT was already committed. + * Transaction was already committed. */ export const AEROSPIKE_MRT_COMMITTED = 124; /** - * MRT was already committed. + * Transaction was already committed. */ export const MRT_COMMITTED = 124; /** - * MRT was already aborted. + * Transaction was already aborted. */ export const AEROSPIKE_MRT_ABORTED = 125; /** - * MRT was already aborted. + * Transaction was already aborted. */ export const MRT_ABORTED = 125; /** From ee73e5d86897e387518e4dbfba40140092cca0c0 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 11:48:07 -0700 Subject: [PATCH 391/417] Fixed results for aborting aborted transaction and committing committed transaction --- lib/client.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/client.js b/lib/client.js index f41ec30be..1b19abd81 100644 --- a/lib/client.js +++ b/lib/client.js @@ -24,6 +24,8 @@ const as = require('bindings')('aerospike.node') const AerospikeError = require('./error') const status = require('./status') const txnState = require('./txn_state') +const abortStatus = require('./abort_status') +const commitStatus = require('./commit_status') const Transaction = require('./transaction') const Context = require('./cdt_context') const Commands = require('./commands') @@ -223,9 +225,7 @@ Client.prototype.abort = function (transaction, callback) { err.code = status.TXN_ALREADY_COMMITTED throw err } else if (transaction.getState() === txnState.ABORTED) { - const err = new AerospikeError('The transaction has already been aborted.') - err.code = status.TXN_ALREADY_ABORTED - throw err + return abortStatus.ALREADY_ABORTED } else if (transaction.getDestroyed() === true) { throw new AerospikeError('The object has been destroyed, please create a new transaction.') } @@ -240,9 +240,7 @@ Client.prototype.commit = function (transaction, callback) { _transactionPool.tendTransactions() if (transaction instanceof Transaction) { if (transaction.getState() === txnState.COMMITTED) { - const err = new AerospikeError('The transaction has already been committed.') - err.code = status.TXN_ALREADY_COMMITTED - throw err + return commitStatus.ALREADY_COMMITTED } else if (transaction.getState() === txnState.ABORTED) { const err = new AerospikeError('The transaction has already been aborted.') err.code = status.TXN_ALREADY_ABORTED From 1ac2de66f1b224fb2df1e225b1daa014d6bb67d8 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 11:54:10 -0700 Subject: [PATCH 392/417] CI/CD enginerring --- .github/workflows/build-bindings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index f076eb010..d702e311b 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -370,6 +370,7 @@ jobs: status: ${{ job.status }} context: ${{ env.STATUS_CHECK_MESSAGE }} + test-self-hosted: needs: cibuildbinding # There's a top-level env variable for this but we can't use it here, unfortunately From 4f7fa7afb853bf9c48e5d58549d721dd14e5ff44 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 12:19:59 -0700 Subject: [PATCH 393/417] CI/CD enginerring --- .github/workflows/build-bindings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index d702e311b..f076eb010 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -370,7 +370,6 @@ jobs: status: ${{ job.status }} context: ${{ env.STATUS_CHECK_MESSAGE }} - test-self-hosted: needs: cibuildbinding # There's a top-level env variable for this but we can't use it here, unfortunately From 19627f14cb8263b6372f3a17371a2a4b3125ed12 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 12:23:43 -0700 Subject: [PATCH 394/417] CI/CD enginerring --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ac69b8ed..828434171 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -396,6 +396,12 @@ jobs: # Should be ready after 3 seconds run: sleep 3 + - name: install mocha + run: | + npm install mocha + npm run test-preq + working-directory: ts-test + - name: Run tests run: npm run valgrind -- --t 40000 From c5d09f6f38bc8d8739777c89dcf9af869b37afbd Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 12:25:10 -0700 Subject: [PATCH 395/417] Fixed testing issue --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a9ba295b..b3d7d98c1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -396,6 +396,12 @@ jobs: # Should be ready after 3 seconds run: sleep 3 + - name: install mocha + run: | + npm install mocha + npm run test-preq + working-directory: ts-test + - name: Run tests run: npm run valgrind -- --t 40000 From 8765884ef49cae53caad30cc299e2145c5a754eb Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 12:36:15 -0700 Subject: [PATCH 396/417] CI/CD enginerring --- .github/workflows/tests.yml | 6 ------ .github/workflows/verify-npm-install.yml | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 828434171..4ac69b8ed 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -396,12 +396,6 @@ jobs: # Should be ready after 3 seconds run: sleep 3 - - name: install mocha - run: | - npm install mocha - npm run test-preq - working-directory: ts-test - - name: Run tests run: npm run valgrind -- --t 40000 diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index 3b99424bf..a7adff9c5 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -19,14 +19,14 @@ jobs: nodejs-tag: ${{ fromJSON(inputs.nodejs-tags) }} runs-on: ${{ matrix.os }} steps: + - name: Delete workspace + run: rm -rf ${{ github.workspace }}/* + - uses: actions/setup-node@v4 with: node-version: ${{ matrix.nodejs-tag[1] }} - name: verify runs and is aligned run: | - mkdir clawn; - cd clawn; npm install xyzparbart --omit-dev; - ls node_modules\xyzparbart\lib\binding node -e "console.log(require('xyzparbart').Transaction.commitStatus)"; \ No newline at end of file From bdc7fb6fad2041ef4df70f9d043161f7708f1479 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 12:38:43 -0700 Subject: [PATCH 397/417] Fixed testing issue --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b3d7d98c1..7be47ec49 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -399,9 +399,9 @@ jobs: - name: install mocha run: | npm install mocha - npm run test-preq + npm run test-prereq working-directory: ts-test - + - name: Run tests run: npm run valgrind -- --t 40000 From b911e794f83a4ca07553bda98f9e93c86070eea9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 12:48:04 -0700 Subject: [PATCH 398/417] Fixed testing issue --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7be47ec49..064e9679a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -396,10 +396,12 @@ jobs: # Should be ready after 3 seconds run: sleep 3 + - name: install pre-req + run: npm run test-prereq + - name: install mocha run: | npm install mocha - npm run test-prereq working-directory: ts-test - name: Run tests From 06729552bfb70df39895d2543867c5d3ba08397e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 12:49:15 -0700 Subject: [PATCH 399/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 86 +++++++++++++-------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 63c38b9bb..a87f159c2 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,53 +25,53 @@ jobs: # uses: ./.github/workflows/release-package.yml # secrets: inherit - rebuild-artifacts-with-new-dev-num: - #needs: bump-dev-number - name: Rebuild artifacts with new dev number - uses: ./.github/workflows/build-artifacts.yml - with: - # On pull_request_target, the bump version commit will be ignored - # So we must pass it manually to the workflow - sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} - secrets: inherit - - #test-npm-install: - # needs: rebuild-artifacts-with-new-dev-num - # name: Test npm install command for npm package - # uses: ./.github/workflows/npm-install-script-test.yml - # secrets: inherit - - upload-to-jfrog: - name: Upload artifacts to JFrog - needs: [ - # bump-dev-number, - rebuild-artifacts-with-new-dev-num - ] - uses: ./.github/workflows/upload-to-jfrog.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit - - publish-to-npm: - name: Upload artifacts to JFrog - needs: [ - # bump-dev-number, - rebuild-artifacts-with-new-dev-num, - upload-to-jfrog - ] - uses: ./.github/workflows/upload-jfrog-build-to-npm.yml - with: - version: ${{ needs.bump-dev-number.outputs.new_version }} - secrets: inherit +# rebuild-artifacts-with-new-dev-num: +# #needs: bump-dev-number +# name: Rebuild artifacts with new dev number +# uses: ./.github/workflows/build-artifacts.yml +# with: +# # On pull_request_target, the bump version commit will be ignored +# # So we must pass it manually to the workflow +# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} +# secrets: inherit +# +# #test-npm-install: +# # needs: rebuild-artifacts-with-new-dev-num +# # name: Test npm install command for npm package +# # uses: ./.github/workflows/npm-install-script-test.yml +# # secrets: inherit +# +# upload-to-jfrog: +# name: Upload artifacts to JFrog +# needs: [ +# # bump-dev-number, +# rebuild-artifacts-with-new-dev-num +# ] +# uses: ./.github/workflows/upload-to-jfrog.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit +# +# publish-to-npm: +# name: Upload artifacts to JFrog +# needs: [ +# # bump-dev-number, +# rebuild-artifacts-with-new-dev-num, +# upload-to-jfrog +# ] +# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml +# with: +# version: ${{ needs.bump-dev-number.outputs.new_version }} +# secrets: inherit verify-npm-install: name: verify npm install works correctly - needs: [ + #needs: [ # bump-dev-number, - rebuild-artifacts-with-new-dev-num, - upload-to-jfrog, - publish-to-npm - ] + # rebuild-artifacts-with-new-dev-num, + # upload-to-jfrog, + # publish-to-npm + #] uses: ./.github/workflows/verify-npm-install.yml secrets: inherit From f76cae4d948ff33ce5ad40c97d3e4568c8b2437d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 13:05:05 -0700 Subject: [PATCH 400/417] Fixed testing issue --- .github/workflows/tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 064e9679a..741fe797c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -405,7 +405,12 @@ jobs: working-directory: ts-test - name: Run tests - run: npm run valgrind -- --t 40000 + run: + cd ts-test; + npm install typescript --save-dev; + npx tsc; + cd ..; + npm run valgrind -- --t 40000 # test-typescript: # runs-on: ubuntu-latest From 1dd953346b32b5e3c89b86e66cf198b1d8b388e1 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 13:16:30 -0700 Subject: [PATCH 401/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- .github/workflows/verify-npm-install.yml | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index c105a13df..f7b32b904 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.31 --no-git-tag-version + run: npm version 6.0.3-dev.32 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.31 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.32 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.31 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.32 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index b896b63c2..d6f29ae13 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.31 + NEW_VERSION: 6.0.3-dev.32 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.31/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.32/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.31/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.32/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.31 --no-git-tag-version + npm version 6.0.3-dev.32 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.31/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.32/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index a7dacec3f..55a20f547 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.31 + NEW_VERSION: 6.0.3-dev.32 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.31 + run: jf rt build-publish nodejs-client 6.0.3-dev.32 diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index a7adff9c5..e0d24305b 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -9,7 +9,6 @@ on: required: false default: '[["v108", "18"], ["v115", "20"], ["v127", "22"], ["v131", "23"]]' - jobs: run-npm-install-and-require-test: strategy: @@ -20,6 +19,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Delete workspace + if: ${{ inputs.platform-tag != 'win_amd64' }} run: rm -rf ${{ github.workspace }}/* - uses: actions/setup-node@v4 From 6d1d87449a1f1b9fa830c3ad355568e6d8aa0c7d Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 13:18:28 -0700 Subject: [PATCH 402/417] Fixed testing issue --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 741fe797c..d49c0e924 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -409,6 +409,7 @@ jobs: cd ts-test; npm install typescript --save-dev; npx tsc; + cp tests/udf.lua dist/udf.lua; cd ..; npm run valgrind -- --t 40000 From 813a7c49547cb6263bffb9fb754aaf24a1cbcd3e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 13:24:30 -0700 Subject: [PATCH 403/417] CI/CD enginerring --- .github/workflows/verify-npm-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-npm-install.yml b/.github/workflows/verify-npm-install.yml index e0d24305b..9115ad16f 100644 --- a/.github/workflows/verify-npm-install.yml +++ b/.github/workflows/verify-npm-install.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Delete workspace - if: ${{ inputs.platform-tag != 'win_amd64' }} + if: ${{ matrix.os != 'windows-2022' }} run: rm -rf ${{ github.workspace }}/* - uses: actions/setup-node@v4 From c633d3b1e2241592652f49600c00efa6608a65aa Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 13:31:54 -0700 Subject: [PATCH 404/417] CI/CD enginerring --- .github/workflows/dev-workflow-p1.yml | 12 +-- .github/workflows/dev-workflow-p2.yml | 86 +++++++++---------- .github/workflows/npm-install-script-test.yml | 6 +- .../workflows/upload-jfrog-build-to-npm.yml | 10 +-- .github/workflows/upload-to-jfrog.yml | 4 +- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.github/workflows/dev-workflow-p1.yml b/.github/workflows/dev-workflow-p1.yml index 6d26a3bec..8e90900c7 100644 --- a/.github/workflows/dev-workflow-p1.yml +++ b/.github/workflows/dev-workflow-p1.yml @@ -27,12 +27,12 @@ on: default: false jobs: -# test-with-server-release: -# uses: ./.github/workflows/build-artifacts.yml -# with: -# run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} -# sha-to-build-and-test: ${{ github.sha }} -# secrets: inherit + test-with-server-release: + uses: ./.github/workflows/build-artifacts.yml + with: + run_tests: ${{ github.event_name == 'pull_request' && true || inputs.run_server_release_tests }} + sha-to-build-and-test: ${{ github.sha }} + secrets: inherit # test-with-server-rc: # needs: test-with-server-release diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index a87f159c2..63c38b9bb 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -25,53 +25,53 @@ jobs: # uses: ./.github/workflows/release-package.yml # secrets: inherit -# rebuild-artifacts-with-new-dev-num: -# #needs: bump-dev-number -# name: Rebuild artifacts with new dev number -# uses: ./.github/workflows/build-artifacts.yml -# with: -# # On pull_request_target, the bump version commit will be ignored -# # So we must pass it manually to the workflow -# sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} -# secrets: inherit -# -# #test-npm-install: -# # needs: rebuild-artifacts-with-new-dev-num -# # name: Test npm install command for npm package -# # uses: ./.github/workflows/npm-install-script-test.yml -# # secrets: inherit -# -# upload-to-jfrog: -# name: Upload artifacts to JFrog -# needs: [ -# # bump-dev-number, -# rebuild-artifacts-with-new-dev-num -# ] -# uses: ./.github/workflows/upload-to-jfrog.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit -# -# publish-to-npm: -# name: Upload artifacts to JFrog -# needs: [ -# # bump-dev-number, -# rebuild-artifacts-with-new-dev-num, -# upload-to-jfrog -# ] -# uses: ./.github/workflows/upload-jfrog-build-to-npm.yml -# with: -# version: ${{ needs.bump-dev-number.outputs.new_version }} -# secrets: inherit + rebuild-artifacts-with-new-dev-num: + #needs: bump-dev-number + name: Rebuild artifacts with new dev number + uses: ./.github/workflows/build-artifacts.yml + with: + # On pull_request_target, the bump version commit will be ignored + # So we must pass it manually to the workflow + sha-to-build-and-test: ${{ needs.bump-dev-number.outputs.bump_sha }} + secrets: inherit + + #test-npm-install: + # needs: rebuild-artifacts-with-new-dev-num + # name: Test npm install command for npm package + # uses: ./.github/workflows/npm-install-script-test.yml + # secrets: inherit + + upload-to-jfrog: + name: Upload artifacts to JFrog + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num + ] + uses: ./.github/workflows/upload-to-jfrog.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit + + publish-to-npm: + name: Upload artifacts to JFrog + needs: [ + # bump-dev-number, + rebuild-artifacts-with-new-dev-num, + upload-to-jfrog + ] + uses: ./.github/workflows/upload-jfrog-build-to-npm.yml + with: + version: ${{ needs.bump-dev-number.outputs.new_version }} + secrets: inherit verify-npm-install: name: verify npm install works correctly - #needs: [ + needs: [ # bump-dev-number, - # rebuild-artifacts-with-new-dev-num, - # upload-to-jfrog, - # publish-to-npm - #] + rebuild-artifacts-with-new-dev-num, + upload-to-jfrog, + publish-to-npm + ] uses: ./.github/workflows/verify-npm-install.yml secrets: inherit diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index f7b32b904..10ee9bf80 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.32 --no-git-tag-version + run: npm version 6.0.3-dev.33 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.32 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.33 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.32 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.33 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index d6f29ae13..e361f01af 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.32 + NEW_VERSION: 6.0.3-dev.33 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.32/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.33/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.32/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.33/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.32 --no-git-tag-version + npm version 6.0.3-dev.33 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.32/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.33/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 55a20f547..b8db247cd 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.32 + NEW_VERSION: 6.0.3-dev.33 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.32 + run: jf rt build-publish nodejs-client 6.0.3-dev.33 From 657e61e248bf2d6688a697a5a85eb5f47e39c907 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 13:53:45 -0700 Subject: [PATCH 405/417] Fixed testing issue --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d49c0e924..f7642d7df 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -402,15 +402,15 @@ jobs: - name: install mocha run: | npm install mocha - working-directory: ts-test - - - name: Run tests - run: cd ts-test; npm install typescript --save-dev; npx tsc; cp tests/udf.lua dist/udf.lua; cd ..; + working-directory: ts-test + + - name: Run tests + run: npm run valgrind -- --t 40000 # test-typescript: From 46c953bc3af458863db92c680c2e2607ec8eb689 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 14:01:52 -0700 Subject: [PATCH 406/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 10ee9bf80..c7294811e 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.33 --no-git-tag-version + run: npm version 6.0.3-dev.34 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.33 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.34 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.33 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.34 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index e361f01af..1d7abeba5 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.33 + NEW_VERSION: 6.0.3-dev.34 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.33/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.34/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.33/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.34/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.33 --no-git-tag-version + npm version 6.0.3-dev.34 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.33/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.34/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index b8db247cd..0ccef866e 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.33 + NEW_VERSION: 6.0.3-dev.34 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.33 + run: jf rt build-publish nodejs-client 6.0.3-dev.34 From dc628cccbf0907a7db0d4d0a5edebc1589bfba0a Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 14:02:23 -0700 Subject: [PATCH 407/417] Fixed testing issue --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f7642d7df..50215e712 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -402,11 +402,9 @@ jobs: - name: install mocha run: | npm install mocha - cd ts-test; npm install typescript --save-dev; npx tsc; cp tests/udf.lua dist/udf.lua; - cd ..; working-directory: ts-test - name: Run tests From b634be96a9b734fc30f03cd20b95a94daead4431 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 14:15:42 -0700 Subject: [PATCH 408/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index c7294811e..12946525c 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -76,7 +76,6 @@ jobs: - name: Change install command for release run: node ./scripts/change-install-command.js - - name: run install command run: npm install From 251497e300bc845c13fe150144bffdd6a3ac86ae Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 14:48:31 -0700 Subject: [PATCH 409/417] Fixed testing issue --- .github/workflows/windows-build.yml | 78 ----------------------------- 1 file changed, 78 deletions(-) delete mode 100644 .github/workflows/windows-build.yml diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml deleted file mode 100644 index 88a1593ce..000000000 --- a/.github/workflows/windows-build.yml +++ /dev/null @@ -1,78 +0,0 @@ -# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions - -name: Aerospike Node.js Windows Client Tests - -on: - push: - branches: - - master - - maint/3.x - - maint/4.x - - gh-action - pull_request: - branches: - - master - - stage - - maint/3.x - - maint/4.x - -jobs: - # setup: - # runs-on: ubuntu-latest - # steps: - # - name: Set up Aerospike Database - # uses: reugn/github-action-aerospike@v1 - - build: - runs-on: windows-latest - strategy: - matrix: - node-version: # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ - - 18.x - - 20.x - - 22.x - - 23.x - continue-on-error: true - name: Node ${{ matrix.node-version }} tester - steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - name: Setup Windows SDK - uses: GuillaumeFalourd/setup-windows10-sdk-action@v1.11 - with: - sdk-version: 17763 - - name: Setup NuGet.exe - uses: nuget/setup-nuget@v1 - with: - nuget-version: latest - - run: nuget restore aerospike.sln - working-directory: aerospike-client-c\vs\ - - name: Setup node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - - name: Update node-gyp - run: | - $WhereNode = Get-Command node | Select-Object -ExpandProperty Definition - $NodeDirPath = Split-Path $WhereNode -Parent - [Version]$npmVersion = npm --version - if ($npmVersion -lt [Version]"7.0") { - $NodeModulesPath = $NodeDirPath + "\node_modules\npm\node_modules\npm-lifecycle" - } else { - $NodeModulesPath = $NodeDirPath + "\node_modules\npm\node_modules\@npmcli\run-script" - } - cd $NodeModulesPath - npm install node-gyp@10.x - - name: Install nodejs Client - shell: pwsh - run: npm ci --unsafe-perm --build-from-source - # - name: Test nodejs client - # run: npm test - # env: - # AEROSPIKE_HOSTS: "127.0.0.1:3000" - # OPTIONS: "--timeout 30000 --set demp ${{ matrix.node }}" \ No newline at end of file From 6f1814574a48181ee0badf11c7ce2a97dce9f8b9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 15:39:18 -0700 Subject: [PATCH 410/417] CI/CD enginerring --- .github/workflows/dev-workflow-p2.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml index 63c38b9bb..a78b49655 100644 --- a/.github/workflows/dev-workflow-p2.yml +++ b/.github/workflows/dev-workflow-p2.yml @@ -75,7 +75,6 @@ jobs: uses: ./.github/workflows/verify-npm-install.yml secrets: inherit - # # We don't want the artifacts in JFrog to also exist in Github # delete-artifacts: # needs: upload-to-jfrog From 2f034be417f7ee582659dedd6c0cdf199c026f34 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 15:39:55 -0700 Subject: [PATCH 411/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 12946525c..db492ffb5 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -71,7 +71,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.34 --no-git-tag-version + run: npm version 6.0.3-dev.35 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -104,7 +104,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.34 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.35 #- name: npm publish # run: | @@ -112,7 +112,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.34 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.35 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 1d7abeba5..44850faae 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.34 + NEW_VERSION: 6.0.3-dev.35 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.34/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.35/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.34/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.35/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.34 --no-git-tag-version + npm version 6.0.3-dev.35 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.34/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.35/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index 0ccef866e..e0eb35ef2 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.34 + NEW_VERSION: 6.0.3-dev.35 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.34 + run: jf rt build-publish nodejs-client 6.0.3-dev.35 From 101cc81de44a5fadf2b190f257d1d8b97eaf1ba6 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 15:52:33 -0700 Subject: [PATCH 412/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index db492ffb5..9b2832cfd 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -65,6 +65,7 @@ jobs: ls ./lib/binding || echo "No artifacts found in binding" ls ./lib/binding/glibc@2.35 + - name: Set up Node.js uses: actions/setup-node@v4 with: From e6c4f80539d7077e259a06875fa21f09f615515b Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 16:26:14 -0700 Subject: [PATCH 413/417] CI/CD enginerring --- .github/workflows/npm-install-script-test.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index 9b2832cfd..f4cefd437 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -72,7 +72,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.35 --no-git-tag-version + run: npm version 6.0.3-dev.36 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.35 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.36 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.35 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.36 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 44850faae..5f8cf0bd0 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.35 + NEW_VERSION: 6.0.3-dev.36 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.35/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.36/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.35/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.36/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.35 --no-git-tag-version + npm version 6.0.3-dev.36 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.35/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.36/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index e0eb35ef2..c1ca4ec40 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.35 + NEW_VERSION: 6.0.3-dev.36 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.35 + run: jf rt build-publish nodejs-client 6.0.3-dev.36 From c639ce6e1a3b9723656a413d47b72458da4ad26c Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 16:26:21 -0700 Subject: [PATCH 414/417] Fixed testing issue --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7a96c77e..ea435efe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,35 @@ All notable changes to this project will be documented in this file. +## [6.0.2] +* **New Features** + * [CLIENT-3243] - Added TXN_ALREADY_COMMITTED and TXN_ALREADY_ABORTED error codes. + * [CLIENT-3267] - Added MRT_ALREADY_LOCKED and MRT_MONITOR_EXISTS error codes. + +* **Bug Fixes** + * [CLIENT-3306] - Added the following missing error codes: + * ERR_MAX_RETRIES_EXCEEDED + * MRT_TOO_MANY_WRITES + * NOT_WHITELISTED + * QUOTA_EXCEEDED + +* **Improvements** + * [CLIENT-3244] - Removed commitStatus.ALREADY_ABORTED and abortStatus.ALREADY_COMMITTED + * [CLIENT-3277] - Exception is now thrown when aborting a committed transaction. + * [CLIENT-3277] - Exception is now thrown when committing an aborted transaciton. + * [CLIENT-3291] - Default client MRT timeout to zero. + +## [6.0.1] +* **Bug Fixes** + * [CLIENT-3235] - Fixed version mismatch with the windows C++ add-on which caused the client to fail on windows. + +## [6.0.0] +* **Description** + * The new features in this release require server version 8.0.0 or above. + +* **New Features** + * [CLIENT-3181] - Added support for multi-record transactions (MRTs). Requires server version 8.0.0 or above. + ## [5.13.2] * **Bug Fixes** * [CLIENT-3155] - Fixed typescript compilation by removing the protected modifier from the ExpOperation class. From bd40e0485b9c0aea9d02efe6ab821cdf670f99d9 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 16:38:12 -0700 Subject: [PATCH 415/417] Fixed testing issue --- .gitmodules | 2 +- aerospike-client-c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index be8c9ebcd..fdf1dc411 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "aerospike-client-c"] path = aerospike-client-c url = https://github.com/aerospike/aerospike-client-c.git - branch = stage + branch = master diff --git a/aerospike-client-c b/aerospike-client-c index da2bf9abb..57160bb73 160000 --- a/aerospike-client-c +++ b/aerospike-client-c @@ -1 +1 @@ -Subproject commit da2bf9abbe96e8cef351975c9b34f3c95d8bb908 +Subproject commit 57160bb736217c6c96b3f0ce8d310dce18c41b1f From a79afe1566163571241ef715460f4cf23424fcfa Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 17:42:47 -0700 Subject: [PATCH 416/417] Added CI/CD changes to current branch --- .github/workflows/npm-install-script-test.yml | 6 +++--- .github/workflows/upload-jfrog-build-to-npm.yml | 10 +++++----- .github/workflows/upload-to-jfrog.yml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/npm-install-script-test.yml b/.github/workflows/npm-install-script-test.yml index f4cefd437..40cccce09 100644 --- a/.github/workflows/npm-install-script-test.yml +++ b/.github/workflows/npm-install-script-test.yml @@ -72,7 +72,7 @@ jobs: node-version: 20 - name: Set version - run: npm version 6.0.3-dev.36 --no-git-tag-version + run: npm version 6.0.3-dev.37 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -105,7 +105,7 @@ jobs: uses: ./.github/actions/download-github-artifacts/ - name: Publish NPM package - run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.36 + run: jf npm publish --build-name nodejs-client --build-number 6.0.3-dev.37 #- name: npm publish # run: | @@ -113,7 +113,7 @@ jobs: - name: npm install run: | - jf npm install --build-name nodejs-client --build-number 6.0.3-dev.36 + jf npm install --build-name nodejs-client --build-number 6.0.3-dev.37 - name: Simple require test run: | diff --git a/.github/workflows/upload-jfrog-build-to-npm.yml b/.github/workflows/upload-jfrog-build-to-npm.yml index 5f8cf0bd0..e4ab7a2a5 100644 --- a/.github/workflows/upload-jfrog-build-to-npm.yml +++ b/.github/workflows/upload-jfrog-build-to-npm.yml @@ -63,20 +63,20 @@ jobs: - name: Download Artifacts from Jfrog run: jf rt dl "clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/" "downloaded-artifacts/" env: - NEW_VERSION: 6.0.3-dev.36 + NEW_VERSION: 6.0.3-dev.37 PACKAGE_MANAGER: npm - name: list Artifacts run: | - ls downloaded-artifacts/aerospike/6.0.3-dev.36/lib/binding/ + ls downloaded-artifacts/aerospike/6.0.3-dev.37/lib/binding/ - name: Move artifacts run: | - cp -r downloaded-artifacts/aerospike/6.0.3-dev.36/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.37/lib/binding/ lib/ - name: change verison run: | - npm version 6.0.3-dev.36 --no-git-tag-version + npm version 6.0.3-dev.37 --no-git-tag-version - name: Change install command for release run: node ./scripts/change-install-command.js @@ -94,7 +94,7 @@ jobs: run: | rm -rf lib/binding mkdir lib/binding - cp -r downloaded-artifacts/aerospike/6.0.3-dev.36/lib/binding/ lib/ + cp -r downloaded-artifacts/aerospike/6.0.3-dev.37/lib/binding/ lib/ - name: npm publish run: | diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml index c1ca4ec40..ff18e9a4b 100644 --- a/.github/workflows/upload-to-jfrog.yml +++ b/.github/workflows/upload-to-jfrog.yml @@ -69,10 +69,10 @@ jobs: # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551 run: jf rt upload --build-name nodejs-client --build-number ${{ env.NEW_VERSION }}/ "./lib/binding/*" clients-${{ env.PACKAGE_MANAGER }}-dev-local/aerospike/${{ env.NEW_VERSION }}/ env: - NEW_VERSION: 6.0.3-dev.36 + NEW_VERSION: 6.0.3-dev.37 PACKAGE_MANAGER: npm - name: Publish build info if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }} - run: jf rt build-publish nodejs-client 6.0.3-dev.36 + run: jf rt build-publish nodejs-client 6.0.3-dev.37 From e8ba061108b96c7c7f1fc0f223e76e280c490188 Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Fri, 24 Jan 2025 18:48:46 -0700 Subject: [PATCH 417/417] update version --- package-lock.json | 30 ++++++++++++++++++------------ package.json | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b8076571..09d71f8cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "aerospike", - "version": "6.0.1", + "version": "6.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aerospike", - "version": "6.0.1", + "version": "6.0.2", "cpu": [ "x64", "arm64" @@ -455,9 +455,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz", - "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==", + "version": "9.19.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz", + "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==", "dev": true, "license": "MIT", "engines": { @@ -2389,9 +2389,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.87", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.87.tgz", - "integrity": "sha512-mPFwmEWmRivw2F8x3w3l2m6htAUN97Gy0kwpO++2m9iT1Gt8RCFVUfv9U/sIbHJ6rY4P6/ooqFL/eL7ock+pPg==", + "version": "1.5.88", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.88.tgz", + "integrity": "sha512-K3C2qf1o+bGzbilTDCTBhTQcMS9KW60yTAaTeeXsfvQuTDDwlokLam/AdqlqcSy9u4UainDgsHV23ksXAOgamw==", "dev": true, "license": "ISC" }, @@ -3506,12 +3506,18 @@ "license": "ISC" }, "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.4.tgz", + "integrity": "sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==", "license": "MIT", "dependencies": { - "is-callable": "^1.1.3" + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/foreground-child": { diff --git a/package.json b/package.json index 86978674d..82f7803a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aerospike", - "version": "6.0.1", + "version": "6.0.2", "description": "Aerospike Client Library", "keywords": [ "aerospike",