From eefa5932029541ec7ff3dc6d295fa0eb1db535ab Mon Sep 17 00:00:00 2001 From: dbiguenet <110406974+dbiguenet@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:30:42 +0100 Subject: [PATCH] Make a single reality-data-transfer package (exports maps) --- README.md | 3 +- pnpm-lock.yaml | 368 ++++++++---------- typescript/examples/code-samples/package.json | 7 +- .../code-samples/src/ContextCapture.ts | 3 +- .../examples/code-samples/src/DataTransfer.ts | 3 +- .../examples/code-samples/src/Lines3D.ts | 3 +- .../examples/code-samples/src/Objects2D.ts | 2 +- .../code-samples/src/RealityConversion.ts | 3 +- .../examples/code-samples/tsconfig.json | 3 +- typescript/examples/web-app/package.json | 7 +- typescript/examples/web-app/tsconfig.json | 8 +- .../reality-capture-analysis/package.json | 4 +- .../RealityDataAnalysis.test.ts | 2 +- .../reality-capture-analysis/tsconfig.json | 3 +- .../reality-capture-conversion/package.json | 4 +- .../RealityConversion.test.ts | 2 +- .../reality-capture-conversion/tsconfig.json | 3 +- .../reality-capture-modeling/package.json | 4 +- .../integration-tests/ContextCapture.test.ts | 3 +- .../reality-capture-modeling/tsconfig.json | 3 +- .../reality-data-transfer-node/LICENSE.md | 9 - .../reality-data-transfer-node/README.md | 71 ---- .../reality-data-transfer-node/package.json | 59 --- .../reality-data-transfer-node/tsconfig.json | 20 - .../reality-data-transfer/package.json | 30 +- .../src/BrowserMain.ts} | 4 +- .../src/{index.ts => NodeMain.ts} | 4 +- .../RealityDataTransferBrowser.ts | 0 .../ReferenceTableBrowser.test.ts | 0 .../{ => browser}/ReferenceTableBrowser.ts | 0 .../src/node}/RealityDataTransferNode.ts | 10 + .../src/node}/ReferenceTableNode.ts | 0 32 files changed, 224 insertions(+), 421 deletions(-) delete mode 100644 typescript/packages/reality-data-transfer-node/LICENSE.md delete mode 100644 typescript/packages/reality-data-transfer-node/README.md delete mode 100644 typescript/packages/reality-data-transfer-node/package.json delete mode 100644 typescript/packages/reality-data-transfer-node/tsconfig.json rename typescript/packages/{reality-data-transfer-node/src/index.ts => reality-data-transfer/src/BrowserMain.ts} (77%) rename typescript/packages/reality-data-transfer/src/{index.ts => NodeMain.ts} (79%) rename typescript/packages/reality-data-transfer/src/{ => browser}/RealityDataTransferBrowser.ts (100%) rename typescript/packages/reality-data-transfer/src/{ => browser}/ReferenceTableBrowser.test.ts (100%) rename typescript/packages/reality-data-transfer/src/{ => browser}/ReferenceTableBrowser.ts (100%) rename typescript/packages/{reality-data-transfer-node/src => reality-data-transfer/src/node}/RealityDataTransferNode.ts (99%) rename typescript/packages/{reality-data-transfer-node/src => reality-data-transfer/src/node}/ReferenceTableNode.ts (100%) diff --git a/README.md b/README.md index da840928..498d608f 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,7 @@ Besides, a typescript web application example is available to show how to create Reality data utils to upload and download results -- [Reality Data utils (Browser)](./typescript/packages/reality-data-transfer/README.md) -- [Reality Data utils (Node)](./typescript/packages/reality-data-transfer-node/README.md) +- [Reality Data utils](./typescript/packages/reality-data-transfer/README.md) All the packages are available in python, except Reality Management diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b94b8076..a5ad8a99 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,9 +35,6 @@ importers: '@itwin/reality-data-transfer': specifier: workspace:* version: link:../../packages/reality-data-transfer - '@itwin/reality-data-transfer-node': - specifier: workspace:* - version: link:../../packages/reality-data-transfer-node dotenv: specifier: ^16.0.3 version: 16.3.1 @@ -50,10 +47,10 @@ importers: version: 18.18.6 '@typescript-eslint/eslint-plugin': specifier: ^5.30.6 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.6.4) + version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.0.4) '@typescript-eslint/parser': specifier: ^5.30.6 - version: 5.62.0(eslint@8.51.0)(typescript@4.6.4) + version: 5.62.0(eslint@8.51.0)(typescript@5.0.4) eslint: specifier: ^8.19.0 version: 8.51.0 @@ -61,8 +58,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 typescript: - specifier: ^4.5.1 - version: 4.6.4 + specifier: ^5.0.0 + version: 5.0.4 typescript/examples/web-app: dependencies: @@ -174,7 +171,7 @@ importers: devDependencies: '@bentley/react-scripts': specifier: ^5.0.0 - version: 5.0.6(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(react@18.2.0)(typescript@4.6.4) + version: 5.0.6(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(react@18.2.0)(typescript@5.0.4) '@itwin/build-tools': specifier: ^4.0.0 version: 4.2.0(@types/node@18.18.6) @@ -192,10 +189,10 @@ importers: version: 18.2.14 '@typescript-eslint/eslint-plugin': specifier: ^5.30.6 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.6.4) + version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.0.4) '@typescript-eslint/parser': specifier: ^5.30.6 - version: 5.62.0(eslint@8.51.0)(typescript@4.6.4) + version: 5.62.0(eslint@8.51.0)(typescript@5.0.4) eslint: specifier: ^8.19.0 version: 8.51.0 @@ -206,8 +203,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 typescript: - specifier: ^4.5.1 - version: 4.6.4 + specifier: ^5.0.0 + version: 5.0.4 typescript/packages/reality-capture-analysis: dependencies: @@ -217,7 +214,7 @@ importers: devDependencies: '@itwin/build-tools': specifier: ^4.0.0 - version: 4.2.0(@types/node@18.18.6) + version: 4.2.0 '@itwin/core-bentley': specifier: ^4.0.0 version: 4.2.0 @@ -230,9 +227,9 @@ importers: '@itwin/reality-data-client': specifier: workspace:* version: link:../reality-data-client - '@itwin/reality-data-transfer-node': + '@itwin/reality-data-transfer': specifier: workspace:* - version: link:../reality-data-transfer-node + version: link:../reality-data-transfer '@itwin/service-authorization': specifier: ^1.0.0 version: 1.0.3(@itwin/core-bentley@4.2.0)(@itwin/core-geometry@4.2.0) @@ -270,14 +267,14 @@ importers: specifier: ^3.0.2 version: 3.0.2 typescript: - specifier: ^4.5.1 - version: 4.6.4 + specifier: ^5.0.0 + version: 5.0.4 typescript/packages/reality-capture-common: devDependencies: '@itwin/build-tools': specifier: ^4.0.0 - version: 4.2.0(@types/node@18.18.6) + version: 4.2.0 '@types/chai': specifier: ^4.3.3 version: 4.3.9 @@ -317,7 +314,7 @@ importers: devDependencies: '@itwin/build-tools': specifier: ^4.0.0 - version: 4.2.0(@types/node@18.18.6) + version: 4.2.0 '@itwin/core-bentley': specifier: ^4.0.0 version: 4.2.0 @@ -330,9 +327,9 @@ importers: '@itwin/reality-data-client': specifier: workspace:* version: link:../reality-data-client - '@itwin/reality-data-transfer-node': + '@itwin/reality-data-transfer': specifier: workspace:* - version: link:../reality-data-transfer-node + version: link:../reality-data-transfer '@itwin/service-authorization': specifier: ^1.0.0 version: 1.0.3(@itwin/core-bentley@4.2.0)(@itwin/core-geometry@4.2.0) @@ -370,8 +367,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 typescript: - specifier: ^4.5.1 - version: 4.6.4 + specifier: ^5.0.0 + version: 5.0.4 typescript/packages/reality-capture-modeling: dependencies: @@ -381,7 +378,7 @@ importers: devDependencies: '@itwin/build-tools': specifier: ^4.0.0 - version: 4.2.0(@types/node@18.18.6) + version: 4.2.0 '@itwin/core-bentley': specifier: ^4.0.0 version: 4.2.0 @@ -394,9 +391,9 @@ importers: '@itwin/reality-data-client': specifier: workspace:* version: link:../reality-data-client - '@itwin/reality-data-transfer-node': + '@itwin/reality-data-transfer': specifier: workspace:* - version: link:../reality-data-transfer-node + version: link:../reality-data-transfer '@itwin/service-authorization': specifier: ^1.0.0 version: 1.0.3(@itwin/core-bentley@4.2.0)(@itwin/core-geometry@4.2.0) @@ -434,8 +431,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 typescript: - specifier: ^4.5.1 - version: 4.6.4 + specifier: ^5.0.0 + version: 5.0.4 typescript/packages/reality-data-client: dependencies: @@ -448,7 +445,7 @@ importers: devDependencies: '@itwin/build-tools': specifier: ^4.0.0 - version: 4.2.0(@types/node@18.18.6) + version: 4.2.0 '@itwin/certa': specifier: ^4.0.0 version: 4.2.0 @@ -512,19 +509,34 @@ importers: typescript/packages/reality-data-transfer: dependencies: + '@azure/abort-controller': + specifier: ^1.1.0 + version: 1.1.0 '@azure/storage-blob': - specifier: ^12.13.0 - version: 12.16.0 + specifier: ^12.8.0 + version: 12.12.0 + '@xmldom/xmldom': + specifier: ^0.8.6 + version: 0.8.10 + uuid: + specifier: ^9.0.0 + version: 9.0.1 devDependencies: '@itwin/build-tools': specifier: ^4.0.0 version: 4.2.0(@types/node@18.18.6) + '@itwin/core-backend': + specifier: ^4.0.0 + version: 4.2.0(@itwin/core-bentley@4.2.0)(@itwin/core-common@4.2.0)(@itwin/core-geometry@4.2.0) '@itwin/core-bentley': specifier: ^4.0.0 version: 4.2.0 '@itwin/core-common': specifier: ^4.0.0 version: 4.2.0(@itwin/core-bentley@4.2.0)(@itwin/core-geometry@4.2.0) + '@itwin/core-geometry': + specifier: ^4.0.0 + version: 4.2.0 '@itwin/reality-capture-common': specifier: workspace:* version: link:../reality-capture-common @@ -543,6 +555,12 @@ importers: '@types/mocha': specifier: ^10.0.0 version: 10.0.3 + '@types/node': + specifier: ^18.12.0 + version: 18.18.6 + '@types/uuid': + specifier: ^9.0.0 + version: 9.0.6 '@types/wicg-file-system-access': specifier: ^2020.9.5 version: 2020.9.8 @@ -574,64 +592,6 @@ importers: specifier: ^4.5.1 version: 4.6.4 - typescript/packages/reality-data-transfer-node: - dependencies: - '@azure/abort-controller': - specifier: ^1.1.0 - version: 1.1.0 - '@azure/storage-blob': - specifier: ^12.8.0 - version: 12.16.0 - '@itwin/reality-capture-common': - specifier: workspace:* - version: link:../reality-capture-common - '@xmldom/xmldom': - specifier: ^0.8.6 - version: 0.8.10 - uuid: - specifier: ^9.0.0 - version: 9.0.1 - devDependencies: - '@itwin/build-tools': - specifier: ^4.0.0 - version: 4.2.0(@types/node@18.18.6) - '@itwin/core-backend': - specifier: ^4.0.0 - version: 4.2.0(@itwin/core-bentley@4.2.0)(@itwin/core-common@4.2.0)(@itwin/core-geometry@4.2.0) - '@itwin/core-bentley': - specifier: ^4.0.0 - version: 4.2.0 - '@itwin/core-common': - specifier: ^4.0.0 - version: 4.2.0(@itwin/core-bentley@4.2.0)(@itwin/core-geometry@4.2.0) - '@itwin/core-geometry': - specifier: ^4.0.0 - version: 4.2.0 - '@itwin/reality-data-client': - specifier: ^1.0.0 - version: link:../reality-data-client - '@types/node': - specifier: ^18.12.0 - version: 18.18.6 - '@types/uuid': - specifier: ^9.0.0 - version: 9.0.6 - '@typescript-eslint/eslint-plugin': - specifier: ^5.30.6 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.6.4) - '@typescript-eslint/parser': - specifier: ^5.30.6 - version: 5.62.0(eslint@8.51.0)(typescript@4.6.4) - eslint: - specifier: ^8.19.0 - version: 8.51.0 - rimraf: - specifier: ^3.0.2 - version: 3.0.2 - typescript: - specifier: ^4.5.1 - version: 4.6.4 - packages: /@aashutoshrathi/word-wrap@1.2.6: @@ -721,6 +681,7 @@ packages: xml2js: 0.5.0 transitivePeerDependencies: - encoding + dev: true /@azure/core-lro@2.5.4: resolution: {integrity: sha512-3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q==} @@ -789,22 +750,6 @@ packages: - encoding dev: true - /@azure/storage-blob@12.16.0: - resolution: {integrity: sha512-jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q==} - engines: {node: '>=14.0.0'} - dependencies: - '@azure/abort-controller': 1.1.0 - '@azure/core-http': 3.0.3 - '@azure/core-lro': 2.5.4 - '@azure/core-paging': 1.5.0 - '@azure/core-tracing': 1.0.0-preview.13 - '@azure/logger': 1.0.4 - events: 3.3.0 - tslib: 2.6.2 - transitivePeerDependencies: - - encoding - dev: false - /@babel/code-frame@7.22.13: resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} engines: {node: '>=6.9.0'} @@ -2256,7 +2201,7 @@ packages: requiresBuild: true dev: true - /@bentley/react-scripts@5.0.6(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(react@18.2.0)(typescript@4.6.4): + /@bentley/react-scripts@5.0.6(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(react@18.2.0)(typescript@5.0.4): resolution: {integrity: sha512-W3LFyFJoSmRwz0Ga/1ZiUlW8BY1aJU1lyH0kBaXLnMqHyXz9CT4UlhfB3DNKOCWypsXytekUifrqrKTolHJkfQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -2286,7 +2231,7 @@ packages: dotenv: 10.0.0 dotenv-expand: 5.1.0 eslint: 8.51.0 - eslint-config-react-app: 7.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.51.0)(jest@27.5.1)(typescript@4.6.4) + eslint-config-react-app: 7.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.51.0)(jest@27.5.1)(typescript@5.0.4) eslint-webpack-plugin: 3.2.0(eslint@8.51.0)(webpack@5.89.0) fast-sass-loader: 2.0.1(sass@1.69.4)(webpack@5.89.0) file-loader: 6.2.0(webpack@5.89.0) @@ -2305,7 +2250,7 @@ packages: prompts: 2.4.2 react: 18.2.0 react-app-polyfill: 3.0.0 - react-dev-utils: 12.0.1(eslint@8.51.0)(typescript@4.6.4)(webpack@5.89.0) + react-dev-utils: 12.0.1(eslint@8.51.0)(typescript@5.0.4)(webpack@5.89.0) react-refresh: 0.11.0 resolve: 1.22.8 resolve-url-loader: 4.0.0 @@ -2317,8 +2262,8 @@ packages: svg-sprite-loader: 6.0.11 tailwindcss: 3.3.3 terser-webpack-plugin: 5.3.9(webpack@5.89.0) - ts-jest: 27.1.5(@babel/core@7.23.2)(babel-jest@27.5.1)(jest@27.5.1)(typescript@4.6.4) - typescript: 4.6.4 + ts-jest: 27.1.5(@babel/core@7.23.2)(babel-jest@27.5.1)(jest@27.5.1)(typescript@5.0.4) + typescript: 5.0.4 webpack: 5.89.0(webpack-cli@5.1.4) webpack-dev-server: 4.15.1(webpack@5.89.0) webpack-manifest-plugin: 4.1.1(webpack@5.89.0) @@ -2798,6 +2743,30 @@ packages: oidc-client: 1.11.5 dev: false + /@itwin/build-tools@4.2.0: + resolution: {integrity: sha512-AfaKxbb9lliFAKKMjMAJSm1gcv5gOjSTmtLrzeIAhfGOhDOrDZOkcflMZsOFikqHmwf4hVmNp2kl9JwMP8Gkrg==} + hasBin: true + dependencies: + '@microsoft/api-extractor': 7.36.4(@types/node@18.18.6) + chalk: 3.0.0 + cpx2: 3.0.2 + cross-spawn: 7.0.3 + fs-extra: 8.1.0 + glob: 7.2.3 + mocha: 10.2.0 + mocha-junit-reporter: 2.2.1(mocha@10.2.0) + rimraf: 3.0.2 + tree-kill: 1.2.2 + typedoc: 0.23.28(typescript@5.0.4) + typedoc-plugin-merge-modules: 4.1.0(typedoc@0.23.28) + typescript: 5.0.4 + wtfnode: 0.9.1 + yargs: 17.7.2 + transitivePeerDependencies: + - '@types/node' + - supports-color + dev: true + /@itwin/build-tools@4.2.0(@types/node@18.18.6): resolution: {integrity: sha512-AfaKxbb9lliFAKKMjMAJSm1gcv5gOjSTmtLrzeIAhfGOhDOrDZOkcflMZsOFikqHmwf4hVmNp2kl9JwMP8Gkrg==} hasBin: true @@ -2845,17 +2814,6 @@ packages: - supports-color dev: true - /@itwin/cloud-agnostic-core@2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13): - resolution: {integrity: sha512-Z2sLCbZ7gFUnmVNnOa9oPXrdGVr64eSZcfXN2NOOy5fQscnAidaUZXf+Xzbh7K655siq0K8PtzNZYQLRoLZMtQ==} - engines: {node: '>=12.20 <19.0.0'} - peerDependencies: - inversify: ^6.0.1 - reflect-metadata: ^0.1.13 - dependencies: - inversify: 6.0.1 - reflect-metadata: 0.1.13 - dev: true - /@itwin/cloud-agnostic-core@2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13): resolution: {integrity: sha512-Z2sLCbZ7gFUnmVNnOa9oPXrdGVr64eSZcfXN2NOOy5fQscnAidaUZXf+Xzbh7K655siq0K8PtzNZYQLRoLZMtQ==} engines: {node: '>=12.20 <19.0.0'} @@ -2865,7 +2823,6 @@ packages: dependencies: inversify: 6.0.2 reflect-metadata: 0.1.13 - dev: false /@itwin/components-react@4.6.2(@itwin/appui-abstract@4.2.0)(@itwin/core-bentley@4.2.0)(@itwin/core-react@4.6.2)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-aEE//gEwibUXzjzeSdNlwCNCukXECBIS8a768GgSTX4fPWoxdyQk77d4ywO13K8DjPmHhnMR8OrIqNhOkWb9sQ==} @@ -2909,16 +2866,16 @@ packages: optional: true dependencies: '@bentley/imodeljs-native': 4.2.10 - '@itwin/cloud-agnostic-core': 2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13) + '@itwin/cloud-agnostic-core': 2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13) '@itwin/core-bentley': 4.2.0 '@itwin/core-common': 4.2.0(@itwin/core-bentley@4.2.0)(@itwin/core-geometry@4.2.0) '@itwin/core-geometry': 4.2.0 '@itwin/core-telemetry': 4.2.0(@itwin/core-geometry@4.2.0) - '@itwin/object-storage-azure': 2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13) - '@itwin/object-storage-core': 2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13) + '@itwin/object-storage-azure': 2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13) + '@itwin/object-storage-core': 2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13) form-data: 2.5.1 fs-extra: 8.1.0 - inversify: 6.0.1 + inversify: 6.0.2 json5: 2.2.3 multiparty: 4.2.3 reflect-metadata: 0.1.13 @@ -3297,7 +3254,7 @@ packages: - debug dev: false - /@itwin/object-storage-azure@2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13): + /@itwin/object-storage-azure@2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13): resolution: {integrity: sha512-URxpik9jcBhflOx1NM5UzFhIggQpZ8olgfaLJkeH8f9KleHg0mwODMRpSEn8mXUjutgylwVXNzMnPClqj9puuQ==} engines: {node: '>=12.20 <19.0.0'} peerDependencies: @@ -3306,30 +3263,15 @@ packages: dependencies: '@azure/core-paging': 1.5.0 '@azure/storage-blob': 12.13.0 - '@itwin/cloud-agnostic-core': 2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13) - '@itwin/object-storage-core': 2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13) - inversify: 6.0.1 + '@itwin/cloud-agnostic-core': 2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13) + '@itwin/object-storage-core': 2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13) + inversify: 6.0.2 reflect-metadata: 0.1.13 transitivePeerDependencies: - debug - encoding dev: true - /@itwin/object-storage-core@2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13): - resolution: {integrity: sha512-QQuFa01x+tE3SwbXI74C9y2y8aMqshrirgVCpf4ehczxUGP8aF1Zl3qNCfvySR2fXmlfrx1FYPdGGU5NINTG3Q==} - engines: {node: '>=12.20 <19.0.0'} - peerDependencies: - inversify: ^6.0.1 - reflect-metadata: ^0.1.13 - dependencies: - '@itwin/cloud-agnostic-core': 2.1.1(inversify@6.0.1)(reflect-metadata@0.1.13) - axios: 0.27.2 - inversify: 6.0.1 - reflect-metadata: 0.1.13 - transitivePeerDependencies: - - debug - dev: true - /@itwin/object-storage-core@2.1.1(inversify@6.0.2)(reflect-metadata@0.1.13): resolution: {integrity: sha512-QQuFa01x+tE3SwbXI74C9y2y8aMqshrirgVCpf4ehczxUGP8aF1Zl3qNCfvySR2fXmlfrx1FYPdGGU5NINTG3Q==} engines: {node: '>=12.20 <19.0.0'} @@ -3343,7 +3285,6 @@ packages: reflect-metadata: 0.1.13 transitivePeerDependencies: - debug - dev: false /@itwin/oidc-signin-tool@4.2.0(@itwin/core-bentley@4.2.0)(@itwin/core-geometry@4.0.0): resolution: {integrity: sha512-V4rIAHMtr30C4vVB97jkFhRzKFQq7Y1zMYxLLBjQY3rfas+HhMel1wKcJ1WRTbjVagkYSSpIFUaKS7OlYihRiA==} @@ -3444,7 +3385,7 @@ packages: dependencies: '@itwin/core-bentley': 4.2.0 '@itwin/core-geometry': 4.2.0 - axios: 1.6.0 + axios: 1.6.2 transitivePeerDependencies: - debug dev: false @@ -3979,7 +3920,7 @@ packages: engines: {node: '>=16'} hasBin: true dependencies: - '@types/node': 20.9.0 + '@types/node': 18.18.6 playwright-core: 1.35.1 optionalDependencies: fsevents: 2.3.2 @@ -4574,12 +4515,6 @@ packages: /@types/node@18.18.6: resolution: {integrity: sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==} - /@types/node@20.9.0: - resolution: {integrity: sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==} - dependencies: - undici-types: 5.26.5 - dev: true - /@types/pako@2.0.2: resolution: {integrity: sha512-AtTbzIwhvLMTEUPudP3hxUwNK50DoX3amfVJmmL7WQH5iF3Kfqs8pG1tStsewHqmh75ULmjjldKn/B70D6DNcQ==} dev: false @@ -4757,7 +4692,7 @@ packages: - supports-color dev: true - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.6.4): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.0.4): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4769,29 +4704,29 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.9.1 - '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.0.4) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.51.0)(typescript@4.6.4) - '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.51.0)(typescript@5.0.4) + '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.0.4) debug: 4.3.4(supports-color@8.1.1) eslint: 8.51.0 graphemer: 1.4.0 ignore: 5.2.4 natural-compare-lite: 1.4.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@4.6.4) - typescript: 4.6.4 + tsutils: 3.21.0(typescript@5.0.4) + typescript: 5.0.4 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils@5.62.0(eslint@8.51.0)(typescript@4.6.4): + /@typescript-eslint/experimental-utils@5.62.0(eslint@8.51.0)(typescript@5.0.4): resolution: {integrity: sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.0.4) eslint: 8.51.0 transitivePeerDependencies: - supports-color @@ -4818,7 +4753,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.51.0)(typescript@4.6.4): + /@typescript-eslint/parser@5.62.0(eslint@8.51.0)(typescript@5.0.4): resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4830,10 +4765,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.6.4) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.4) debug: 4.3.4(supports-color@8.1.1) eslint: 8.51.0 - typescript: 4.6.4 + typescript: 5.0.4 transitivePeerDependencies: - supports-color dev: true @@ -4882,7 +4817,7 @@ packages: - supports-color dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.51.0)(typescript@4.6.4): + /@typescript-eslint/type-utils@5.62.0(eslint@8.51.0)(typescript@5.0.4): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4892,12 +4827,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.6.4) - '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.4) + '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.0.4) debug: 4.3.4(supports-color@8.1.1) eslint: 8.51.0 - tsutils: 3.21.0(typescript@4.6.4) - typescript: 4.6.4 + tsutils: 3.21.0(typescript@5.0.4) + typescript: 5.0.4 transitivePeerDependencies: - supports-color dev: true @@ -4938,7 +4873,7 @@ packages: - supports-color dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@4.6.4): + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.0.4): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -4953,8 +4888,8 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@4.6.4) - typescript: 4.6.4 + tsutils: 3.21.0(typescript@5.0.4) + typescript: 5.0.4 transitivePeerDependencies: - supports-color dev: true @@ -5000,7 +4935,7 @@ packages: - typescript dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.51.0)(typescript@4.6.4): + /@typescript-eslint/utils@5.62.0(eslint@8.51.0)(typescript@5.0.4): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -5011,7 +4946,7 @@ packages: '@types/semver': 7.5.4 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.6.4) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.0.4) eslint: 8.51.0 eslint-scope: 5.1.1 semver: 7.5.4 @@ -5712,7 +5647,6 @@ packages: proxy-from-env: 1.1.0 transitivePeerDependencies: - debug - dev: true /axobject-query@3.2.1: resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==} @@ -7567,7 +7501,7 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.51.0)(jest@27.5.1)(typescript@4.6.4): + /eslint-config-react-app@7.0.1(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.51.0)(jest@27.5.1)(typescript@5.0.4): resolution: {integrity: sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==} engines: {node: '>=14.0.0'} peerDependencies: @@ -7580,19 +7514,19 @@ packages: '@babel/core': 7.23.2 '@babel/eslint-parser': 7.22.15(@babel/core@7.23.2)(eslint@8.51.0) '@rushstack/eslint-patch': 1.5.1 - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.6.4) - '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.0.4) + '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.0.4) babel-preset-react-app: 10.0.1 confusing-browser-globals: 1.0.11 eslint: 8.51.0 eslint-plugin-flowtype: 8.0.3(@babel/plugin-syntax-flow@7.23.3)(@babel/plugin-transform-react-jsx@7.22.15)(eslint@8.51.0) eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint@8.51.0) - eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.51.0)(jest@27.5.1)(typescript@4.6.4) + eslint-plugin-jest: 25.7.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.51.0)(jest@27.5.1)(typescript@5.0.4) eslint-plugin-jsx-a11y: 6.7.1(eslint@8.51.0) eslint-plugin-react: 7.33.2(eslint@8.51.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.51.0) - eslint-plugin-testing-library: 5.11.1(eslint@8.51.0)(typescript@4.6.4) - typescript: 4.6.4 + eslint-plugin-testing-library: 5.11.1(eslint@8.51.0)(typescript@5.0.4) + typescript: 5.0.4 transitivePeerDependencies: - '@babel/plugin-syntax-flow' - '@babel/plugin-transform-react-jsx' @@ -7690,7 +7624,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.0.4) debug: 3.2.7 eslint: 8.51.0 eslint-import-resolver-node: 0.3.9 @@ -7774,7 +7708,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/parser': 5.62.0(eslint@8.51.0)(typescript@5.0.4) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -7808,7 +7742,7 @@ packages: requireindex: 1.1.0 dev: true - /eslint-plugin-jest@25.7.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.51.0)(jest@27.5.1)(typescript@4.6.4): + /eslint-plugin-jest@25.7.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.51.0)(jest@27.5.1)(typescript@5.0.4): resolution: {integrity: sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} peerDependencies: @@ -7821,8 +7755,8 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@4.6.4) - '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.51.0)(typescript@5.0.4) + '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.51.0)(typescript@5.0.4) eslint: 8.51.0 jest: 27.5.1 transitivePeerDependencies: @@ -7916,13 +7850,13 @@ packages: string.prototype.matchall: 4.0.10 dev: true - /eslint-plugin-testing-library@5.11.1(eslint@8.51.0)(typescript@4.6.4): + /eslint-plugin-testing-library@5.11.1(eslint@8.51.0)(typescript@5.0.4): resolution: {integrity: sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'} peerDependencies: eslint: ^7.5.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@4.6.4) + '@typescript-eslint/utils': 5.62.0(eslint@8.51.0)(typescript@5.0.4) eslint: 8.51.0 transitivePeerDependencies: - supports-color @@ -8460,7 +8394,7 @@ packages: signal-exit: 3.0.7 dev: true - /fork-ts-checker-webpack-plugin@6.5.3(eslint@8.51.0)(typescript@4.6.4)(webpack@5.89.0): + /fork-ts-checker-webpack-plugin@6.5.3(eslint@8.51.0)(typescript@5.0.4)(webpack@5.89.0): resolution: {integrity: sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==} engines: {node: '>=10', yarn: '>=1.0.0'} peerDependencies: @@ -8488,7 +8422,7 @@ packages: schema-utils: 2.7.0 semver: 7.5.4 tapable: 1.1.3 - typescript: 4.6.4 + typescript: 5.0.4 webpack: 5.89.0(webpack-cli@5.1.4) dev: true @@ -8558,7 +8492,7 @@ packages: dependencies: graceful-fs: 4.2.11 jsonfile: 6.1.0 - universalify: 2.0.0 + universalify: 2.0.1 dev: true /fs-extra@11.1.1: @@ -9349,13 +9283,8 @@ packages: engines: {node: '>=10.13.0'} dev: true - /inversify@6.0.1: - resolution: {integrity: sha512-B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ==} - dev: true - /inversify@6.0.2: resolution: {integrity: sha512-i9m8j/7YIv4mDuYXUAcrpKPSaju/CIly9AHK5jvCBeoiM/2KEsuCQTTP+rzSWWpLYWRukdXFSl6ZTk2/uumbiA==} - dev: false /iobuffer@5.3.2: resolution: {integrity: sha512-kO3CjNfLZ9t+tHxAMd+Xk4v3D/31E91rMs1dHrm7ikEQrlZ8mLDbQ4z3tZfDM48zOkReas2jx8MWSAmN9+c8Fw==} @@ -12937,7 +12866,7 @@ packages: shallow-equal: 1.2.1 dev: false - /react-dev-utils@12.0.1(eslint@8.51.0)(typescript@4.6.4)(webpack@5.89.0): + /react-dev-utils@12.0.1(eslint@8.51.0)(typescript@5.0.4)(webpack@5.89.0): resolution: {integrity: sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==} engines: {node: '>=14'} peerDependencies: @@ -12956,7 +12885,7 @@ packages: escape-string-regexp: 4.0.0 filesize: 8.0.7 find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 6.5.3(eslint@8.51.0)(typescript@4.6.4)(webpack@5.89.0) + fork-ts-checker-webpack-plugin: 6.5.3(eslint@8.51.0)(typescript@5.0.4)(webpack@5.89.0) global-modules: 2.0.0 globby: 11.1.0 gzip-size: 6.0.0 @@ -12971,7 +12900,7 @@ packages: shell-quote: 1.8.1 strip-ansi: 6.0.1 text-table: 0.2.0 - typescript: 4.6.4 + typescript: 5.0.4 webpack: 5.89.0(webpack-cli@5.1.4) transitivePeerDependencies: - eslint @@ -14655,7 +14584,7 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: true - /ts-jest@27.1.5(@babel/core@7.23.2)(babel-jest@27.5.1)(jest@27.5.1)(typescript@4.6.4): + /ts-jest@27.1.5(@babel/core@7.23.2)(babel-jest@27.5.1)(jest@27.5.1)(typescript@5.0.4): resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -14686,7 +14615,7 @@ packages: lodash.memoize: 4.1.2 make-error: 1.3.6 semver: 7.5.4 - typescript: 4.6.4 + typescript: 5.0.4 yargs-parser: 20.2.9 dev: true @@ -14716,6 +14645,16 @@ packages: typescript: 4.6.4 dev: true + /tsutils@3.21.0(typescript@5.0.4): + resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} + engines: {node: '>= 6'} + peerDependencies: + typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' + dependencies: + tslib: 1.14.1 + typescript: 5.0.4 + dev: true + /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} dependencies: @@ -14822,7 +14761,7 @@ packages: peerDependencies: typedoc: 0.23.x || 0.24.x dependencies: - typedoc: 0.23.28(typescript@4.6.4) + typedoc: 0.23.28(typescript@5.0.4) dev: true /typedoc@0.23.28(typescript@4.6.4): @@ -14839,6 +14778,20 @@ packages: typescript: 4.6.4 dev: true + /typedoc@0.23.28(typescript@5.0.4): + resolution: {integrity: sha512-9x1+hZWTHEQcGoP7qFmlo4unUoVJLB0H/8vfO/7wqTnZxg4kPuji9y3uRzEu0ZKez63OJAUmiGhUrtukC6Uj3w==} + engines: {node: '>= 14.14'} + hasBin: true + peerDependencies: + typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x + dependencies: + lunr: 2.3.9 + marked: 4.3.0 + minimatch: 7.4.6 + shiki: 0.14.5 + typescript: 5.0.4 + dev: true + /typescript@4.6.4: resolution: {integrity: sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==} engines: {node: '>=4.2.0'} @@ -14875,10 +14828,6 @@ packages: resolution: {integrity: sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==} dev: true - /undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - dev: true - /unicode-canonical-property-names-ecmascript@2.0.0: resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} engines: {node: '>=4'} @@ -14933,11 +14882,6 @@ packages: resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} engines: {node: '>= 4.0.0'} - /universalify@2.0.0: - resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==} - engines: {node: '>= 10.0.0'} - dev: true - /universalify@2.0.1: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} engines: {node: '>= 10.0.0'} diff --git a/typescript/examples/code-samples/package.json b/typescript/examples/code-samples/package.json index 17d68b5c..7807e51c 100644 --- a/typescript/examples/code-samples/package.json +++ b/typescript/examples/code-samples/package.json @@ -4,9 +4,7 @@ "description": "Reality Capture SDKs examples", "private": true, "scripts": { - "build": "npm run -s build:cjs && npm run -s build:esm", - "build:cjs": "tsc 1>&2 --outDir lib/cjs", - "build:esm": "tsc 1>&2 --module ES2020 --outDir lib/esm", + "build": "tsc 1>&2", "clean": "rimraf lib build .rush", "lint": "eslint ./src --ext .ts,.tsx ", "lint-fix": "eslint ./src --fix --ext .ts,.tsx", @@ -31,7 +29,6 @@ "@itwin/reality-capture-conversion": "workspace:*", "@itwin/reality-capture-modeling": "workspace:*", "@itwin/reality-data-transfer": "workspace:*", - "@itwin/reality-data-transfer-node": "workspace:*", "@itwin/reality-data-client": "^1.0.0", "dotenv": "^16.0.3" }, @@ -42,6 +39,6 @@ "@typescript-eslint/parser": "^5.30.6", "eslint": "^8.19.0", "rimraf": "^3.0.2", - "typescript": "^4.5.1" + "typescript": "^5.0.0" } } diff --git a/typescript/examples/code-samples/src/ContextCapture.ts b/typescript/examples/code-samples/src/ContextCapture.ts index 1500e86c..aeb9da4e 100644 --- a/typescript/examples/code-samples/src/ContextCapture.ts +++ b/typescript/examples/code-samples/src/ContextCapture.ts @@ -5,11 +5,10 @@ import path from "path"; import { CCJobQuality, CCJobSettings, CCJobType, ContextCaptureService } from "@itwin/reality-capture-modeling"; -import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer-node"; import * as fs from "fs"; import * as dotenv from "dotenv"; import { JobState, RealityDataType } from "@itwin/reality-capture-common"; -import { defaultProgressHook } from "@itwin/reality-data-transfer"; +import { RealityDataTransferNode, ReferenceTableNode, defaultProgressHook } from "@itwin/reality-data-transfer"; import { NodeCliAuthorizationClient } from "@itwin/node-cli-authorization"; export async function sleep(ms: number) { return new Promise(resolve => setTimeout(resolve, ms)); } diff --git a/typescript/examples/code-samples/src/DataTransfer.ts b/typescript/examples/code-samples/src/DataTransfer.ts index 2df5f442..6d45d9ec 100644 --- a/typescript/examples/code-samples/src/DataTransfer.ts +++ b/typescript/examples/code-samples/src/DataTransfer.ts @@ -3,9 +3,8 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -import { RealityDataTransferNode } from "@itwin/reality-data-transfer-node"; import * as dotenv from "dotenv"; -import { defaultProgressHook } from "@itwin/reality-data-transfer"; +import { RealityDataTransferNode, defaultProgressHook } from "@itwin/reality-data-transfer"; import { RealityDataType } from "@itwin/reality-capture-common"; import { NodeCliAuthorizationClient } from "@itwin/node-cli-authorization"; diff --git a/typescript/examples/code-samples/src/Lines3D.ts b/typescript/examples/code-samples/src/Lines3D.ts index ca05c432..73c465a3 100644 --- a/typescript/examples/code-samples/src/Lines3D.ts +++ b/typescript/examples/code-samples/src/Lines3D.ts @@ -5,10 +5,9 @@ import path from "path"; import { L3DJobSettings, RealityDataAnalysisService } from "@itwin/reality-capture-analysis"; -import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer-node"; import * as fs from "fs"; import * as dotenv from "dotenv"; -import { defaultProgressHook } from "@itwin/reality-data-transfer"; +import { RealityDataTransferNode, ReferenceTableNode, defaultProgressHook } from "@itwin/reality-data-transfer"; import { JobState, RealityDataType } from "@itwin/reality-capture-common"; import { NodeCliAuthorizationClient } from "@itwin/node-cli-authorization"; diff --git a/typescript/examples/code-samples/src/Objects2D.ts b/typescript/examples/code-samples/src/Objects2D.ts index 8316d129..c3fda42f 100644 --- a/typescript/examples/code-samples/src/Objects2D.ts +++ b/typescript/examples/code-samples/src/Objects2D.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import { O2DJobSettings, RealityDataAnalysisService } from "@itwin/reality-capture-analysis"; -import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer-node"; import path from "path"; import * as fs from "fs"; import * as dotenv from "dotenv"; import { JobState, RealityDataType } from "@itwin/reality-capture-common"; import { NodeCliAuthorizationClient } from "@itwin/node-cli-authorization"; +import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer"; export async function sleep(ms: number) { return new Promise(resolve => setTimeout(resolve, ms)); } diff --git a/typescript/examples/code-samples/src/RealityConversion.ts b/typescript/examples/code-samples/src/RealityConversion.ts index 3d7e5988..4cf9f7c8 100644 --- a/typescript/examples/code-samples/src/RealityConversion.ts +++ b/typescript/examples/code-samples/src/RealityConversion.ts @@ -5,10 +5,9 @@ import path from "path"; import { RCJobSettings, RealityConversionService } from "@itwin/reality-capture-conversion"; -import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer-node"; import * as fs from "fs"; import * as dotenv from "dotenv"; -import { defaultProgressHook } from "@itwin/reality-data-transfer"; +import { RealityDataTransferNode, ReferenceTableNode, defaultProgressHook } from "@itwin/reality-data-transfer"; import { JobState, RealityDataType } from "@itwin/reality-capture-common"; import { NodeCliAuthorizationClient } from "@itwin/node-cli-authorization"; diff --git a/typescript/examples/code-samples/tsconfig.json b/typescript/examples/code-samples/tsconfig.json index 65f170af..bdd86cc7 100644 --- a/typescript/examples/code-samples/tsconfig.json +++ b/typescript/examples/code-samples/tsconfig.json @@ -9,7 +9,8 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "target": "esnext", - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "NodeNext", "resolveJsonModule": true, "lib": [ "esnext" diff --git a/typescript/examples/web-app/package.json b/typescript/examples/web-app/package.json index 5d37546d..7c25936a 100644 --- a/typescript/examples/web-app/package.json +++ b/typescript/examples/web-app/package.json @@ -3,11 +3,8 @@ "version": "0.1.0-dev.1", "description": "Sample web application to upload data, run reality capture jobs (Analysis, Conversion and Modeling) and display the productions", "private": true, - "main": "lib/index.js", "scripts": { - "build": "npm run -s build:cjs && npm run -s build:esm", - "build:cjs": "tsc 1>&2 --outDir lib/cjs", - "build:esm": "tsc 1>&2 --module ES2020 --outDir lib/esm", + "build": "tsc 1>&2", "clean": "rimraf lib build .rush", "lint": "eslint ./src --ext .ts,.tsx ", "lint-fix": "eslint ./src --fix --ext .ts,.tsx", @@ -70,7 +67,7 @@ "eslint": "^8.19.0", "eslint-plugin-react": "^7.30.1", "rimraf": "^3.0.2", - "typescript": "^4.5.1" + "typescript": "^5.0.0" }, "browserslist": [ "last 4 chrome version", diff --git a/typescript/examples/web-app/tsconfig.json b/typescript/examples/web-app/tsconfig.json index 98c0868b..a998bbc3 100644 --- a/typescript/examples/web-app/tsconfig.json +++ b/typescript/examples/web-app/tsconfig.json @@ -3,15 +3,11 @@ "compilerOptions": { "declaration": false, "declarationMap": false, - "skipLibCheck": true, "outDir": "./lib", "jsx": "react", "allowJs": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "target": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, + "module": "ESNext", + "moduleResolution": "Bundler", "types": [ "@bentley/react-scripts" ], diff --git a/typescript/packages/reality-capture-analysis/package.json b/typescript/packages/reality-capture-analysis/package.json index 1b3da6c2..2efff7bb 100644 --- a/typescript/packages/reality-capture-analysis/package.json +++ b/typescript/packages/reality-capture-analysis/package.json @@ -40,7 +40,7 @@ "@itwin/core-common": "^4.0.0", "@itwin/reality-capture-common": "workspace:*", "@itwin/reality-data-client": "workspace:*", - "@itwin/reality-data-transfer-node": "workspace:*", + "@itwin/reality-data-transfer": "workspace:*", "@itwin/service-authorization": "^1.0.0", "@types/chai": "^4.3.3", "@types/chai-as-promised": "^7.1.5", @@ -53,7 +53,7 @@ "mocha": "^10.1.0", "nyc": "^15.1.0", "rimraf": "^3.0.2", - "typescript": "^4.5.1" + "typescript": "^5.0.0" }, "nyc": { "exclude": ["src/index.ts"] diff --git a/typescript/packages/reality-capture-analysis/src/integration-tests/RealityDataAnalysis.test.ts b/typescript/packages/reality-capture-analysis/src/integration-tests/RealityDataAnalysis.test.ts index b7b0e0bb..336d9a3a 100644 --- a/typescript/packages/reality-capture-analysis/src/integration-tests/RealityDataAnalysis.test.ts +++ b/typescript/packages/reality-capture-analysis/src/integration-tests/RealityDataAnalysis.test.ts @@ -11,10 +11,10 @@ import path from "path"; import * as dotenv from "dotenv"; import { BentleyError } from "@itwin/core-bentley"; import { RealityDataAnalysisService } from "../RealityDataAnalysisService"; -import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer-node"; import { ServiceAuthorizationClient } from "@itwin/service-authorization"; import { JobState, RealityDataType } from "@itwin/reality-capture-common"; import { O2DJobSettings } from "../Settings"; +import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer"; export async function sleep(ms: number) { return new Promise(resolve => setTimeout(resolve, ms)); } diff --git a/typescript/packages/reality-capture-analysis/tsconfig.json b/typescript/packages/reality-capture-analysis/tsconfig.json index e0515a50..4d867330 100644 --- a/typescript/packages/reality-capture-analysis/tsconfig.json +++ b/typescript/packages/reality-capture-analysis/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "outDir": "./lib", "lib": ["dom", "esnext"], - "moduleResolution": "node", + "moduleResolution": "NodeNext", + "module": "NodeNext", "esModuleInterop": true, "noImplicitReturns": true, "noImplicitThis": true, diff --git a/typescript/packages/reality-capture-conversion/package.json b/typescript/packages/reality-capture-conversion/package.json index 6d7ba908..ac01092c 100644 --- a/typescript/packages/reality-capture-conversion/package.json +++ b/typescript/packages/reality-capture-conversion/package.json @@ -40,7 +40,7 @@ "@itwin/core-common": "^4.0.0", "@itwin/reality-capture-common": "workspace:*", "@itwin/reality-data-client": "workspace:*", - "@itwin/reality-data-transfer-node": "workspace:*", + "@itwin/reality-data-transfer": "workspace:*", "@itwin/service-authorization": "^1.0.0", "@types/chai": "^4.3.3", "@types/chai-as-promised": "^7.1.5", @@ -53,7 +53,7 @@ "mocha": "^10.1.0", "nyc": "^15.1.0", "rimraf": "^3.0.2", - "typescript": "^4.5.1" + "typescript": "^5.0.0" }, "nyc": { "exclude": ["src/index.ts"] diff --git a/typescript/packages/reality-capture-conversion/src/integration-tests/RealityConversion.test.ts b/typescript/packages/reality-capture-conversion/src/integration-tests/RealityConversion.test.ts index 37b58897..982c2078 100644 --- a/typescript/packages/reality-capture-conversion/src/integration-tests/RealityConversion.test.ts +++ b/typescript/packages/reality-capture-conversion/src/integration-tests/RealityConversion.test.ts @@ -11,10 +11,10 @@ import * as dotenv from "dotenv"; import path from "path"; import { RealityDataClientOptions, RealityDataAccessClient } from "@itwin/reality-data-client"; import { RealityConversionService } from "../RealityConversionService"; -import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer-node"; import { ServiceAuthorizationClient } from "@itwin/service-authorization"; import { JobState, RealityDataType } from "@itwin/reality-capture-common"; import { RCJobSettings, RCJobType } from "../Utils"; +import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer"; export async function sleep(ms: number) { return new Promise(resolve => setTimeout(resolve, ms)); } diff --git a/typescript/packages/reality-capture-conversion/tsconfig.json b/typescript/packages/reality-capture-conversion/tsconfig.json index e0515a50..4303e90f 100644 --- a/typescript/packages/reality-capture-conversion/tsconfig.json +++ b/typescript/packages/reality-capture-conversion/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "outDir": "./lib", "lib": ["dom", "esnext"], - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "NodeNext", "esModuleInterop": true, "noImplicitReturns": true, "noImplicitThis": true, diff --git a/typescript/packages/reality-capture-modeling/package.json b/typescript/packages/reality-capture-modeling/package.json index 218da334..96e38590 100644 --- a/typescript/packages/reality-capture-modeling/package.json +++ b/typescript/packages/reality-capture-modeling/package.json @@ -40,7 +40,7 @@ "@itwin/core-common": "^4.0.0", "@itwin/reality-capture-common": "workspace:*", "@itwin/reality-data-client": "workspace:*", - "@itwin/reality-data-transfer-node": "workspace:*", + "@itwin/reality-data-transfer": "workspace:*", "@itwin/service-authorization": "^1.0.0", "@types/chai": "^4.3.3", "@types/chai-as-promised": "^7.1.5", @@ -53,7 +53,7 @@ "mocha": "^10.1.0", "nyc": "^15.1.0", "rimraf": "^3.0.2", - "typescript": "^4.5.1" + "typescript": "^5.0.0" }, "nyc": { "exclude": ["src/index.ts"] diff --git a/typescript/packages/reality-capture-modeling/src/integration-tests/ContextCapture.test.ts b/typescript/packages/reality-capture-modeling/src/integration-tests/ContextCapture.test.ts index 9e8aabe3..20598bb6 100644 --- a/typescript/packages/reality-capture-modeling/src/integration-tests/ContextCapture.test.ts +++ b/typescript/packages/reality-capture-modeling/src/integration-tests/ContextCapture.test.ts @@ -11,10 +11,11 @@ import * as dotenv from "dotenv"; import path from "path"; import { RealityDataClientOptions, RealityDataAccessClient } from "@itwin/reality-data-client"; import { ContextCaptureService } from "../ContextCaptureService"; -import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer-node"; import { ServiceAuthorizationClient } from "@itwin/service-authorization"; import { JobState, RealityDataType } from "@itwin/reality-capture-common"; import { CCJobQuality, CCJobSettings, CCJobType } from "../Utils"; +import { RealityDataTransferNode, ReferenceTableNode } from "@itwin/reality-data-transfer"; + export async function sleep(ms: number) { return new Promise(resolve => setTimeout(resolve, ms)); } diff --git a/typescript/packages/reality-capture-modeling/tsconfig.json b/typescript/packages/reality-capture-modeling/tsconfig.json index e0515a50..4303e90f 100644 --- a/typescript/packages/reality-capture-modeling/tsconfig.json +++ b/typescript/packages/reality-capture-modeling/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "outDir": "./lib", "lib": ["dom", "esnext"], - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "NodeNext", "esModuleInterop": true, "noImplicitReturns": true, "noImplicitThis": true, diff --git a/typescript/packages/reality-data-transfer-node/LICENSE.md b/typescript/packages/reality-data-transfer-node/LICENSE.md deleted file mode 100644 index 77dfb504..00000000 --- a/typescript/packages/reality-data-transfer-node/LICENSE.md +++ /dev/null @@ -1,9 +0,0 @@ -# MIT License - -Copyright © 2023 Bentley Systems, Incorporated. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/typescript/packages/reality-data-transfer-node/README.md b/typescript/packages/reality-data-transfer-node/README.md deleted file mode 100644 index d739c85f..00000000 --- a/typescript/packages/reality-data-transfer-node/README.md +++ /dev/null @@ -1,71 +0,0 @@ -# @itwin/reality-data-transfer-node - -Copyright © Bentley Systems, Incorporated. All rights reserved. See LICENSE.md for license terms and full copyright notice. - -## Description - -The **@itwin/reality-data-transfer-node** package contains a sdk to upload local data to ContextShare and download reality data. Doesn't work in a browser environment. - -## Requirements - -A registered application in the iTwin Platform is needed for using reality data transfer node package. Documentation for registering an application can be found [here.](https://developer.bentley.com/tutorials/register-and-modify-application/) Make sure that your application has `realitydata:read realitydata:modify` scopes enabled. - -To use the data transfer package node, you will need to have an access to a project. If you don't have one already, contact one of your Organization Administrators or take some time to go through the following tutorial: Create a [Project](https://developer.bentley.com/tutorials/create-and-query-projects-guide). - -To build and run reality data transfer node, you will need [Node.js](https://nodejs.org/en/) v18 (must be greater than 18.12.x). - -## Key Types and Methods - -### defaultProgressHook - -Sample progress hook for upload and download - -### RealityDataTransferNode - -- `setUploadHook` : Set the upload progress hook -- `setDownloadHook` : Set the download progress hook -- `getScopes` : get the required scopes to use this client -- `uploadRealityData` : Upload reality data to ProjectWise ContextShare. Creates a new reality data. - This function should not be used for ContextScenes or CCOrientations that contain dependencies to other data - unless those dependencies are already uploaded and the file you want to upload points to their id. - Use uploadContextScene or uploadCCOrientation instead. -- `uploadJsonToWorkspace` : Upload .json files to an already existent workspace. - Convenience function to upload specific settings to ContextCapture Service jobs. Files are uploaded to the - workspace passed in argument in the folder job_id/data/ so that the service can find the files when the job is submitted. - This function will upload *all* json files present at the path given in argument but not recursively (it won't - upload json files in subdirectories). -- `uploadContextScene` : Upload a ContextScene to ProjectWise ContextShare. - Convenience function that replaces references if a reference table is provided and upload the ContextScene. - All local dependencies should have been uploaded before, and their IDs provided in the reference table. -- `uploadJsonToWorkspace` : Upload a CCOrientation to ProjectWise ContextShare. - Convenience function that replaces references if a reference table is provided and upload the file. - All local dependencies should have been uploaded before, and their IDs provided in the reference table. -- `downloadRealityData` : Download reality data from ProjectWise ContextShare. - This function should not be used for ContextScenes that contain dependencies to data you have locally as the - paths will point to ids in the ProjectWise ContextShare. - Use downloadContextScene instead. -- `downloadContextScene` : Download a ContextScene from ProjectWise ContextShare. - Convenience function that downloads the ContextScene and replaces references if a reference table is provided. - All dependencies should have been downloaded before or already be local, and their IDs on the cloud and local - paths should be provided in the reference table. -- `downloadCCorientations` : Download a CCOrientation from ProjectWise ContextShare. - Convenience function that downloads the CCOrientation and replaces references if a reference table is provided. - All dependencies should have been downloaded before or already be local, and their IDs on the cloud and local - paths should be provided in the reference table. - -### ReferenceTableNode - -Stores the local path and cloud id of each uploaded data. When uploading a new reality data such as context scene, it might contains local paths, which doesn't mean anything in the cloud. The reference table will check for any local path in the context scene and replace it with the corresponding cloud id. - -- `save` : open a file picker and save references as txt file -- `load` : load references from selected file. Open a file picker to select the reference file -- `addReference` : add a new entry in the reference table -- `removeReference` : remove entry from the reference table -- `hasLocalPath` : check if the provided local path exists in the reference table -- `hasCloudId` : check if the provided cloud id exists in the reference table -- `getCloudIdFromLocalPath` : get a reality data id from a local path -- `getLocalPathFromCloudId` : get a local path from a reality data id - -## Usage example - -An example is available to show how to upload and download reality data. See [Reality Data Transfer](./../../examples/code-samples/src/RealityConversion.ts) \ No newline at end of file diff --git a/typescript/packages/reality-data-transfer-node/package.json b/typescript/packages/reality-data-transfer-node/package.json deleted file mode 100644 index 2d28d9e2..00000000 --- a/typescript/packages/reality-data-transfer-node/package.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "name": "@itwin/reality-data-transfer-node", - "version": "0.1.0-dev.1", - "description": "Utils to upload local data to context share (in Node environment)", - "main": "lib/cjs/index.js", - "module": "lib/esm/index.js", - "typings": "lib/cjs/index", - "scripts": { - "build": "npm run -s build:cjs && npm run -s build:esm", - "build:cjs": "tsc 1>&2 --outDir lib/cjs", - "build:esm": "tsc 1>&2 --module ES2020 --outDir lib/esm", - "clean": "rimraf lib build .rush", - "lint": "eslint ./src --ext .ts,.tsx ", - "lint-fix": "eslint ./src --fix --ext .ts,.tsx", - "test:integration": "", - "test:unit": "", - "coverage": "" - }, - "keywords": [], - "author": { - "name": "Bentley Systems, Inc.", - "url": "http://www.bentley.com" - }, - "repository": { - "type": "git", - "url": "https://github.com/iTwin/reality-capture.git", - "directory": "packages/reality-data-transfer-node" - }, - "license": "MIT", - "dependencies": { - "@azure/abort-controller": "^1.1.0", - "@azure/storage-blob": "^12.8.0", - "@xmldom/xmldom": "^0.8.6", - "uuid": "^9.0.0" - }, - "peerDependencies": { - "@itwin/core-backend": "^4.0.0", - "@itwin/core-bentley": "^4.0.0", - "@itwin/core-common": "^4.0.0", - "@itwin/core-geometry": "^4.0.0", - "@itwin/reality-capture-common": "workspace:*", - "@itwin/reality-data-client": "workspace:*" - }, - "devDependencies": { - "@itwin/build-tools": "^4.0.0", - "@itwin/core-backend": "^4.0.0", - "@itwin/core-bentley": "^4.0.0", - "@itwin/core-common": "^4.0.0", - "@itwin/core-geometry": "^4.0.0", - "@itwin/reality-data-client": "^1.0.0", - "@types/node": "^18.12.0", - "@types/uuid": "^9.0.0", - "@typescript-eslint/eslint-plugin": "^5.30.6", - "@typescript-eslint/parser": "^5.30.6", - "eslint": "^8.19.0", - "rimraf": "^3.0.2", - "typescript": "^4.5.1" - } -} diff --git a/typescript/packages/reality-data-transfer-node/tsconfig.json b/typescript/packages/reality-data-transfer-node/tsconfig.json deleted file mode 100644 index 98400957..00000000 --- a/typescript/packages/reality-data-transfer-node/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./node_modules/@itwin/build-tools/tsconfig-base.json", - "compilerOptions": { - "outDir": "./lib", - "lib": ["dom", "esnext"], - "moduleResolution": "node", - "esModuleInterop": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "noImplicitAny": true, - "allowSyntheticDefaultImports": true - }, - "include": [ - "./src/**/*.ts*", - ], - "exclude": [ - "lib", - "node_modules" - ] -} \ No newline at end of file diff --git a/typescript/packages/reality-data-transfer/package.json b/typescript/packages/reality-data-transfer/package.json index c7597703..54f297ef 100644 --- a/typescript/packages/reality-data-transfer/package.json +++ b/typescript/packages/reality-data-transfer/package.json @@ -2,13 +2,20 @@ "name": "@itwin/reality-data-transfer", "version": "0.1.0-dev.1", "description": "Utils to upload local data to context share", - "main": "lib/cjs/index.js", - "module": "lib/esm/index.js", - "typings": "lib/cjs/index", + "exports": { + "node": { + "types": "./lib/esm/NodeMain.d.ts", + "require": "./lib/esm/NodeMain.js" + }, + "default": { + "types": "./lib/esm/BrowserMain.d.ts", + "import": "./lib/esm/BrowserMain.js" + } + }, "scripts": { "build": "npm run -s build:cjs && npm run -s build:esm", "build:cjs": "tsc 1>&2 --outDir lib/cjs", - "build:esm": "tsc 1>&2 --module ES2020 --outDir lib/esm", + "build:esm": "tsc 1>&2 --module ESNext --outDir lib/esm", "clean": "rimraf lib build .rush", "lint": "eslint ./src --ext .ts,.tsx ", "lint-fix": "eslint ./src --fix --ext .ts,.tsx", @@ -28,22 +35,33 @@ }, "license": "MIT", "dependencies": { - "@azure/storage-blob": "^12.13.0" + "@azure/abort-controller": "^1.1.0", + "@azure/storage-blob": "^12.8.0", + "@xmldom/xmldom": "^0.8.6", + "uuid": "^9.0.0" }, "peerDependencies": { + "@itwin/core-backend": "^4.0.0", "@itwin/core-bentley": "^4.0.0", - "@itwin/core-common": "^4.0.0" + "@itwin/core-common": "^4.0.0", + "@itwin/core-geometry": "^4.0.0", + "@itwin/reality-capture-common": "workspace:*", + "@itwin/reality-data-client": "workspace:*" }, "devDependencies": { "@itwin/build-tools": "^4.0.0", + "@itwin/core-backend": "^4.0.0", "@itwin/core-bentley": "^4.0.0", "@itwin/core-common": "^4.0.0", + "@itwin/core-geometry": "^4.0.0", "@itwin/reality-capture-common": "workspace:*", "@itwin/reality-data-client": "workspace:*", "@itwin/service-authorization": "^1.0.0", "@types/chai": "^4.3.3", "@types/chai-as-promised": "^7.1.5", "@types/mocha": "^10.0.0", + "@types/node": "^18.12.0", + "@types/uuid": "^9.0.0", "@types/wicg-file-system-access": "^2020.9.5", "axios-mock-adapter": "^1.21.3", "chai": "^4.3.6", diff --git a/typescript/packages/reality-data-transfer-node/src/index.ts b/typescript/packages/reality-data-transfer/src/BrowserMain.ts similarity index 77% rename from typescript/packages/reality-data-transfer-node/src/index.ts rename to typescript/packages/reality-data-transfer/src/BrowserMain.ts index 36bdb5a3..d54bd17e 100644 --- a/typescript/packages/reality-data-transfer-node/src/index.ts +++ b/typescript/packages/reality-data-transfer/src/BrowserMain.ts @@ -3,5 +3,5 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -export * from "./RealityDataTransferNode"; -export * from "./ReferenceTableNode"; \ No newline at end of file +export * from "./browser/RealityDataTransferBrowser"; +export * from "./browser/ReferenceTableBrowser"; \ No newline at end of file diff --git a/typescript/packages/reality-data-transfer/src/index.ts b/typescript/packages/reality-data-transfer/src/NodeMain.ts similarity index 79% rename from typescript/packages/reality-data-transfer/src/index.ts rename to typescript/packages/reality-data-transfer/src/NodeMain.ts index b495a16e..d95e4091 100644 --- a/typescript/packages/reality-data-transfer/src/index.ts +++ b/typescript/packages/reality-data-transfer/src/NodeMain.ts @@ -3,5 +3,5 @@ * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -export * from "./RealityDataTransferBrowser"; -export * from "./ReferenceTableBrowser"; \ No newline at end of file +export * from "./node/RealityDataTransferNode"; +export * from "./node/ReferenceTableNode"; \ No newline at end of file diff --git a/typescript/packages/reality-data-transfer/src/RealityDataTransferBrowser.ts b/typescript/packages/reality-data-transfer/src/browser/RealityDataTransferBrowser.ts similarity index 100% rename from typescript/packages/reality-data-transfer/src/RealityDataTransferBrowser.ts rename to typescript/packages/reality-data-transfer/src/browser/RealityDataTransferBrowser.ts diff --git a/typescript/packages/reality-data-transfer/src/ReferenceTableBrowser.test.ts b/typescript/packages/reality-data-transfer/src/browser/ReferenceTableBrowser.test.ts similarity index 100% rename from typescript/packages/reality-data-transfer/src/ReferenceTableBrowser.test.ts rename to typescript/packages/reality-data-transfer/src/browser/ReferenceTableBrowser.test.ts diff --git a/typescript/packages/reality-data-transfer/src/ReferenceTableBrowser.ts b/typescript/packages/reality-data-transfer/src/browser/ReferenceTableBrowser.ts similarity index 100% rename from typescript/packages/reality-data-transfer/src/ReferenceTableBrowser.ts rename to typescript/packages/reality-data-transfer/src/browser/ReferenceTableBrowser.ts diff --git a/typescript/packages/reality-data-transfer-node/src/RealityDataTransferNode.ts b/typescript/packages/reality-data-transfer/src/node/RealityDataTransferNode.ts similarity index 99% rename from typescript/packages/reality-data-transfer-node/src/RealityDataTransferNode.ts rename to typescript/packages/reality-data-transfer/src/node/RealityDataTransferNode.ts index e98dfdd3..c9c331bd 100644 --- a/typescript/packages/reality-data-transfer-node/src/RealityDataTransferNode.ts +++ b/typescript/packages/reality-data-transfer/src/node/RealityDataTransferNode.ts @@ -266,6 +266,16 @@ interface DataTransferInfo { sizes: number[]; } +/** + * Default hook to display progress. + * @param {number} progress current progress (percentage). + * @returns {boolean} false if the upload/download has been cancelled. + */ +export function defaultProgressHook(progress: number): boolean { + console.log("Current progress : " + progress + "%."); + return true; +} + /** * Utility class to upload and download reality data in ContextShare. */ diff --git a/typescript/packages/reality-data-transfer-node/src/ReferenceTableNode.ts b/typescript/packages/reality-data-transfer/src/node/ReferenceTableNode.ts similarity index 100% rename from typescript/packages/reality-data-transfer-node/src/ReferenceTableNode.ts rename to typescript/packages/reality-data-transfer/src/node/ReferenceTableNode.ts