diff --git a/datashare/DataShareClient/build-profile.json5 b/datashare/DataShareClient/build-profile.json5 index 4467a4148499b14aca36d99c7d9d3068eb5cd625..85779237c328ca5ba148aace6bfa39ea1ce4fe44 100644 --- a/datashare/DataShareClient/build-profile.json5 +++ b/datashare/DataShareClient/build-profile.json5 @@ -5,9 +5,9 @@ "name": "default", "material": { "certpath": "C:\\Users\\PaDaBoo\\.ohos\\config\\openharmony\\auto_ohos.cer", - "storePassword": "00000018FDF396A3F03C66559127A7D0751288DD5E76DC04006456474B4E35406CB0BE096C3DFF65", + "storePassword": "0000001894B1CD8CBE2D21F2684807AEFAE491EE02AC4B7D9F3D9F655A708085C7E0C3C1DFECEF29", "keyAlias": "debugKey", - "keyPassword": "000000185C72D68CAC4CBEA6B81623B52F65F944DCC970B3AAC07175F29F04160DB05EF2142657EF", + "keyPassword": "00000018D387D09DBB0800B992D813F4B57C370298C34506AA9FC036BC085EFC88A537A3A57F855F", "profile": "C:\\Users\\PaDaBoo\\.ohos\\config\\openharmony\\auto_ohos_default_com.samples.myapplication.p7b", "signAlg": "SHA256withECDSA", "storeFile": "C:\\Users\\PaDaBoo\\.ohos\\config\\openharmony\\auto_ohos.p12" diff --git a/datashare/DataShareClient/entry-default-signed.hap b/datashare/DataShareClient/entry-default-signed.hap index dc303fd8b09e6820cfc053cb756e6fc0aeebc4c7..ffc10f993f4637243edef8b230c3fb6588bb82b8 100644 Binary files a/datashare/DataShareClient/entry-default-signed.hap and b/datashare/DataShareClient/entry-default-signed.hap differ diff --git a/datashare/DataShareClient/entry/src/main/ets/MainAbility/MainAbility.ts b/datashare/DataShareClient/entry/src/main/ets/MainAbility/MainAbility.ts index d9db3c72561841d7b7e7061156e5b93ae929ec5d..29c63e6d222a9daa24e8f9e6562111f03193711f 100644 --- a/datashare/DataShareClient/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/datashare/DataShareClient/entry/src/main/ets/MainAbility/MainAbility.ts @@ -3,9 +3,12 @@ import dataShare from '@ohos.data.dataShare' import rpc from "@ohos.rpc"; import dataSharePredicates from '@ohos.data.dataSharePredicates' import distributedData from '@ohos.data.distributedData'; +import deviceManager from '@ohos.distributedHardware.deviceManager'; let kvManager; let kvdbStore; +let devManager; + const BUNDLE_NAME = 'com.samples.myapplication'; const STORE_ID = 'storeId'; @@ -103,67 +106,22 @@ export default class MainAbility extends Ability { let context = this.context; dseConnectionId = context.connectAbility(dseWant, dseConnect); - globalThis.create = (async () => { - let mKVMgrConfig = { - userInfo : { - userId : '0', - userType : distributedData.UserType.SAME_USER_ID - }, - bundleName: BUNDLE_NAME, - } - var options = { - createIfMissing : true, - encrypt : false, - backup : false, - autoSync : true, - kvStoreType : distributedData.KVStoreType.SINGLE_VERSION, - schema : {}, - securityLevel : distributedData.SecurityLevel.NO_LEVEL, + let deviceIds = []; + deviceManager.createDeviceManager(BUNDLE_NAME, (err, value) => { + if (err) { + console.info("[ttt] [DataShareTest] <> [createDeviceManager] err = " + err); } - let name = new distributedData.FieldNode('name'); - name.type = distributedData.ValueType.STRING; - name.nullable = false; - name.default = 'name'; - - let age = new distributedData.FieldNode('age'); - age.type = distributedData.ValueType.INTEGER; - age.nullable = false; - age.default = '0'; - - let isStudent = new distributedData.FieldNode('isStudent'); - isStudent.type = distributedData.ValueType.STRING; - isStudent.nullable = false; - isStudent.default = "false"; - - - let schema1 = new distributedData.Schema(); - schema1.root.appendChild(name); - schema1.root.appendChild(age); - schema1.root.appendChild(isStudent); - schema1.indexes = ['$.name', "$.age", "$.isStudent"]; - // options.kvStoreType = distributedData.KVStoreType.DEVICE_COLLABORATION; - options.schema = schema1; - distributedData.createKVManager(mKVMgrConfig, function (err, manager) { - if (err) { - console.info("[ttt] [DataShareTest] <> createKVManager err: " + err); - return; + devManager = value; + console.info('[ttt] [DataShareTest] <> [createDeviceManager] enter'); + // get deviceIds + if (devManager != null) { + var devices = devManager.getTrustedDeviceListSync(); + for (var i = 0; i < devices.length; i++) { + deviceIds[i] = devices[i].deviceId; } - console.info("[ttt] [DataShareTest] <> createKVManager success"); - kvManager = manager; - console.info('[ttt] [DataShareTest] <> createKVManager kvManager = ' + kvManager); - kvManager.getKVStore(STORE_ID, options, function (err, store) { - if (err) { - console.info("[ttt] [DataShareTest] <> getKVStore err: " + err); - return; - } - console.info("[ttt] [DataShareTest] <> getKVStore success"); - kvdbStore = store; - console.info('[ttt] [DataShareTest] <> createKVManager kvdbStore = ' + kvdbStore); - }); - }); - }) - - + } + console.log("[ttt] [DataShareTest] <> deviceIds :" + deviceIds); + }); globalThis.connectDataShareExtAbility = (async () => { console.log("[ttt] [DataShareTest] <> connectDataShareExtAbility begin"); @@ -218,9 +176,10 @@ export default class MainAbility extends Ability { } let getDa = await globalThis.getDa(); let da = getDa.da; -// let da = new dataSharePredicates.DataSharePredicates(); -// let arr = ["name"]; -// da.inKeys(arr); + da.inDevices(deviceIds); +// da.notEqualTo("$.name","wsx") +// da.limit(2,2); +// da.equalTo("$.name","rpf") let columnArray = getDa.columnArray; let result = await globalThis.dsHelper.query(dseUri, da, columnArray, globalThis.getResultSet); if (result != undefined) { @@ -422,15 +381,15 @@ export default class MainAbility extends Ability { console.log("[ttt] [DataShareClientTest] <> openFile end, DSHelper is null"); return; } - let result = await globalThis.dsHelper.openFile(dseUri, globalThis.openFileCallback); - console.log("[ttt] [DataShareClientTest] <> getType end, result:" + result); + let result = await globalThis.dsHelper.openFile(dseUri,"rwt", globalThis.openFileCallback); + console.log("[ttt] [DataShareClientTest] <> openFile end, result:" + result); return result; }) - globalThis.getTypeCallback = (async (err, data) => { + globalThis.openFileCallback = (async (err, data) => { console.log("[ttt] [DataShareClientTest] <> getTypeCallback = " + data); console.log("[ttt] [DataShareClientTest] <> getTypeCallback json= " + JSON.stringify(data)); - AppStorage.SetOrCreate('result', data); + AppStorage.SetOrCreate('result', JSON.stringify(data)); // if(err != -1) { // }else { // AppStorage.SetOrCreate('result', '操作失败'); @@ -624,6 +583,7 @@ export default class MainAbility extends Ability { return; } let optionLength = AppStorage.Get('optionLength'); + console.info("[ttt] [DataShareClientTest] <> optionLength = " + optionLength) let updateOptionName = ''; let updateOptionAge = ''; let updateOptionBoolean = ''; @@ -683,6 +643,8 @@ export default class MainAbility extends Ability { }else if(predicate.functionCheck == 'orderByDesc') { da.orderByDesc(predicate.keyCheck); }else if(predicate.functionCheck == 'limit') { + console.info("ttt Number(predicate.value.split(',')[0]) = " + Number(predicate.value.split(',')[0])); + console.info("ttt Number(predicate.value.split(',')[1]) = " + Number(predicate.value.split(',')[1])); da.limit(Number(predicate.value.split(',')[0]),Number(predicate.value.split(',')[1])); }else if(predicate.functionCheck == 'isNotNull') { da.isNotNull(predicate.keyCheck); diff --git a/datashare/DataShareClient/entry/src/main/ets/pages/index.ets b/datashare/DataShareClient/entry/src/main/ets/pages/index.ets index a80b79c58a494d800706f4d0d1906889dbe0c700..e4a6a25599a2c7da5112f64199387e81fea50c7b 100644 --- a/datashare/DataShareClient/entry/src/main/ets/pages/index.ets +++ b/datashare/DataShareClient/entry/src/main/ets/pages/index.ets @@ -374,7 +374,8 @@ struct Index { if(this.operationSelection == 'batchInsert') { let ret = await globalThis.batchInsert(); console.info('[ttt] [DataShareClientTest] <> batchInsert onclick enter'); - }if(this.operationSelection == 'openFile') { + } + if(this.operationSelection == 'openFile') { let ret = await globalThis.openFile(); console.info('[ttt] [DataShareClientTest] <> openFile onclick enter'); } diff --git a/datashare/DataShareClient/entry/src/main/ets/pages/index/index.ets b/datashare/DataShareClient/entry/src/main/ets/pages/index/index.ets index ce736d31b4563d5380cd4d551ea09f86ea62ce24..7df00dfcdf797f0ce86efae1a451f6ee4af29449 100644 --- a/datashare/DataShareClient/entry/src/main/ets/pages/index/index.ets +++ b/datashare/DataShareClient/entry/src/main/ets/pages/index/index.ets @@ -4,8 +4,7 @@ import dataShare from '@ohos.data.dataShare' import dataAbility from '@ohos.data.dataAbility'; import rdb from '@ohos.data.rdb'; -import {Core, ExpectExtend, InstrumentLog, ReportExtend} from "deccjsunit/index.ets" -import testsuite from "../../test/List.test.ets" + import router from '@system.router'; @@ -23,12 +22,12 @@ async function routePage() { @Entry @Component struct Index { - @State message: string = "Main thread message filed" + @State message: string = "Thread message filed" build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { - Text('DataShare Client Test') - .fontSize(40) + Text('DataShare Client') + .fontSize(30) .fontWeight(FontWeight.Bold) Text(`${this.message}`) diff --git a/datashare/DataShareClient/entry/src/main/module.json5 b/datashare/DataShareClient/entry/src/main/module.json5 index fcfc9a56edaaf84e0b8557e30b85310c6fb655aa..5ecfdb699782fbc880690898179dd44b240f1930 100644 --- a/datashare/DataShareClient/entry/src/main/module.json5 +++ b/datashare/DataShareClient/entry/src/main/module.json5 @@ -34,16 +34,5 @@ "startWindowBackground": "$color:color_1" } ] -// "requestPermissions": [ -// { -// "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" -// }, -// { -// "name": "ohos.permission.GET_BUNDLE_INFO" -// }, -// { -// "name": "ohos.permission.INSTALL_BUNDLE" -// } -// ] } } diff --git a/datashare/rdbServer/.gitignore b/datashare/rdbServer/.gitignore index 2981358453339f3410b8e9f950599013a9ee0a99..16ad22851d8b327b59cf74d965ddae2598a56e11 100644 --- a/datashare/rdbServer/.gitignore +++ b/datashare/rdbServer/.gitignore @@ -1,4 +1,3 @@ /node_modules -/local.properties -/.idea -**/build \ No newline at end of file +/.preview +/build \ No newline at end of file diff --git a/datashare/rdbServer/AppScope/app.json5 b/datashare/rdbServer/AppScope/app.json5 deleted file mode 100644 index 7f09ec2e81e5a1b67d098fed9b018f9a1818bfc7..0000000000000000000000000000000000000000 --- a/datashare/rdbServer/AppScope/app.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - "app": { - "bundleName": "com.samples.datasharetest", - "vendor": "example", - "versionCode": 1000000, - "versionName": "1.0.0", - "icon": "$media:app_icon", - "label": "$string:app_name", - "distributedNotificationEnabled": true - } -} diff --git a/datashare/rdbServer/AppScope/resources/base/element/string.json b/datashare/rdbServer/AppScope/resources/base/element/string.json deleted file mode 100644 index 616c648fb1daa54ca2376c77ea5ac703fa0b205f..0000000000000000000000000000000000000000 --- a/datashare/rdbServer/AppScope/resources/base/element/string.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "datasharetest" - } - ] -} diff --git a/datashare/rdbServer/AppScope/resources/base/media/app_icon.png b/datashare/rdbServer/AppScope/resources/base/media/app_icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/datashare/rdbServer/AppScope/resources/base/media/app_icon.png and /dev/null differ diff --git a/datashare/rdbServer/build-profile.json5 b/datashare/rdbServer/build-profile.json5 index 2c4bccb0237e65116249712a2b96699388335396..7dd0348781a463b2630c2392dd65b9cd53e0c015 100644 --- a/datashare/rdbServer/build-profile.json5 +++ b/datashare/rdbServer/build-profile.json5 @@ -1,40 +1,9 @@ { - "app": { - "signingConfigs": [ - { - "name": "default", - "material": { - "certpath": "C:\\Users\\PaDaBoo\\.ohos\\config\\openharmony\\auto_ohos.cer", - "storePassword": "000000186F8230EEBFA10E3A0B465FF41B9FD83B4782D167E46B263673824323CC84E1572869F7F8", - "keyAlias": "debugKey", - "keyPassword": "000000183E2FF1469C5B129C1084CE72CBC08C61E96DA4D67B23B5E21A69E46037F4529427634CEA", - "profile": "C:\\Users\\PaDaBoo\\.ohos\\config\\openharmony\\auto_ohos_default_com.samples.datasharetest.p7b", - "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\PaDaBoo\\.ohos\\config\\openharmony\\auto_ohos.p12" - } - } - ], - "compileSdkVersion": 9, - "compatibleSdkVersion": 9, - "products": [ - { - "name": "default", - "signingConfig": "default", - } - ] - }, - "modules": [ + "apiType": 'stageMode', +// showInCenter: true, + "targets": [ { - "name": "entry", - "srcPath": "./entry", - "targets": [ - { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] + "name": "default", } ] } \ No newline at end of file diff --git a/datashare/rdbServer/entry-default-signed.hap b/datashare/rdbServer/entry-default-signed.hap index 65416273b0b2c9e814c21895faaa9967ae80515d..c513c0f53da54d105c3ab3ac40015b22309b8f00 100644 Binary files a/datashare/rdbServer/entry-default-signed.hap and b/datashare/rdbServer/entry-default-signed.hap differ diff --git a/datashare/rdbServer/entry/.gitignore b/datashare/rdbServer/entry/.gitignore deleted file mode 100644 index 16ad22851d8b327b59cf74d965ddae2598a56e11..0000000000000000000000000000000000000000 --- a/datashare/rdbServer/entry/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/node_modules -/.preview -/build \ No newline at end of file diff --git a/datashare/rdbServer/entry/build-profile.json5 b/datashare/rdbServer/entry/build-profile.json5 deleted file mode 100644 index 7dd0348781a463b2630c2392dd65b9cd53e0c015..0000000000000000000000000000000000000000 --- a/datashare/rdbServer/entry/build-profile.json5 +++ /dev/null @@ -1,9 +0,0 @@ -{ - "apiType": 'stageMode', -// showInCenter: true, - "targets": [ - { - "name": "default", - } - ] -} \ No newline at end of file diff --git a/datashare/rdbServer/entry/hvigorfile.js b/datashare/rdbServer/entry/hvigorfile.js deleted file mode 100644 index 36336b0bd10996a245b250c50a65341867532d20..0000000000000000000000000000000000000000 --- a/datashare/rdbServer/entry/hvigorfile.js +++ /dev/null @@ -1,2 +0,0 @@ -// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks \ No newline at end of file diff --git a/datashare/rdbServer/entry/package-lock.json b/datashare/rdbServer/entry/package-lock.json deleted file mode 100644 index 9a37aca9c393ce5506b6e1d6ab8ac840d12eae92..0000000000000000000000000000000000000000 --- a/datashare/rdbServer/entry/package-lock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "DataShareTest", - "version": "1.0.0", - "lockfileVersion": 1 -} diff --git a/datashare/rdbServer/entry/package.json b/datashare/rdbServer/entry/package.json deleted file mode 100644 index 88664404f8d84c8e702f59da254bcce0d947eeb5..0000000000000000000000000000000000000000 --- a/datashare/rdbServer/entry/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "license": "ISC", - "devDependencies": {}, - "keywords": [], - "author": "", - "name": "DataShareTest", - "ohos": { - "org": "huawei", - "directoryLevel": "module", - "buildTool": "hvigor" - }, - "description": "example description", - "main": "hvigorfile.js", - "repository": {}, - "version": "1.0.0", - "dependencies": {} -} diff --git a/datashare/rdbServer/hvigorfile.js b/datashare/rdbServer/hvigorfile.js index 586ced98461bdcdac2b070f2e041e99c7ac678d9..36336b0bd10996a245b250c50a65341867532d20 100644 --- a/datashare/rdbServer/hvigorfile.js +++ b/datashare/rdbServer/hvigorfile.js @@ -1,2 +1,2 @@ -// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').appTasks \ No newline at end of file +// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. +module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks \ No newline at end of file diff --git a/datashare/rdbServer/package-lock.json b/datashare/rdbServer/package-lock.json index 017fb40e7deaaf9d107d819671a4f8c2a851ec9c..9a37aca9c393ce5506b6e1d6ab8ac840d12eae92 100644 --- a/datashare/rdbServer/package-lock.json +++ b/datashare/rdbServer/package-lock.json @@ -1,1214 +1,5 @@ { - "name": "datasharetest", + "name": "DataShareTest", "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@ohos/hos-sdkmanager-common": { - "version": "1.0.2", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hos-sdkmanager-common/-/@ohos/hos-sdkmanager-common-1.0.2.tgz", - "integrity": "sha512-nai6RzsFd5tx1o5OwHxqaw+s0dTUjsdrXrwUi6b73EtHxTX6928C0xyEvd9TZ3dt3lSk2TPdSutUZWlDiW1s8A==", - "requires": { - "@ohos/sdkmanager-common": "^1.1.6" - } - }, - "@ohos/hvigor": { - "version": "1.1.3", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor/-/@ohos/hvigor-1.1.3.tgz", - "integrity": "sha512-ACVD5TE+cduiVO2BVP5+KI7BDIp9eWIZp4cxgtBR2NvIZw+/eF/e9tggf56b2WKXFOW+J/ZyN2SVlkbA6LlPhQ==", - "requires": { - "@ohos/hvigor-base": "1.1.3", - "interpret": "1.4.0", - "liftoff": "4.0.0", - "mute-stdout": "1.0.0", - "pretty-hrtime": "1.0.0", - "v8flags": "3.2.0", - "yargs": "7.1.0" - } - }, - "@ohos/hvigor-base": { - "version": "1.1.3", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-base/-/@ohos/hvigor-base-1.1.3.tgz", - "integrity": "sha512-ZD0T1l9s9jeJ3KopehURy8rhF1E8gZ5XgtayYUVJK087p87J2qk9Zjo782oM1xZi7BrLzpNWz+w3yhwxELV5KA==", - "requires": { - "json5": "2.2.0", - "log4js": "6.4.1", - "once": "1.4.0", - "pretty-hrtime": "1.0.0" - } - }, - "@ohos/hvigor-ohos-plugin": { - "version": "1.1.3", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hvigor-ohos-plugin/-/@ohos/hvigor-ohos-plugin-1.1.3.tgz", - "integrity": "sha512-Ft2VCBnvoJoeVjsYsNMNJpNcEOsbPSSZ9LlyWXXRbGieC5x8Pjgv6nyPfC/x+Bb9d8Yum24n4fIRRE6at0z5OA==", - "requires": { - "@ohos/hos-sdkmanager-common": "1.0.2", - "@ohos/hvigor-base": "1.1.3", - "@ohos/sdkmanager-common": "1.1.6", - "adm-zip": "0.5.9", - "ajv": "8.10.0", - "execa": "5.1.1", - "fast-xml-parser": "4.0.3", - "fs-extra": "10.0.0", - "glob": "7.2.0", - "iconv-lite": "0.6.3", - "json5": "2.2.0", - "lodash": "4.17.21", - "pretty-hrtime": "1.0.3", - "resolve-package-path": "4.0.3" - }, - "dependencies": { - "fs-extra": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", - "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "pretty-hrtime": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==" - } - } - }, - "@ohos/hypium": { - "version": "1.0.0", - "resolved": "https://repo.harmonyos.com/npm/@ohos/hypium/-/@ohos/hypium-1.0.0.tgz", - "integrity": "sha512-NhL78mNNQXhZPTt+wfRktVJldXQ76l1GkS3N/KiNSLOFY1OC/gWeO22gp9uPmYntwLVOJm5h+ei2fe51ofyHWw==" - }, - "@ohos/sdkmanager-common": { - "version": "1.1.6", - "resolved": "https://repo.harmonyos.com/npm/@ohos/sdkmanager-common/-/@ohos/sdkmanager-common-1.1.6.tgz", - "integrity": "sha512-9f3cNMQYibL6nVvNtFYcCOYojTi1aYm/WcIU3IswY+QcxveDGLich7S4OP3N78WBQuGCdbx4zU/CyfqQIz71sw==" - }, - "adm-zip": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz", - "integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==" - }, - "ajv": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz", - "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==", - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==" - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==" - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==" - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==" - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "dependencies": { - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "date-format": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.11.tgz", - "integrity": "sha512-VS20KRyorrbMCQmpdl2hg5KaOUsda1RbnsJg461FfrcyCUg+pkd0b40BSW4niQyTheww4DBXQnS7HwSrKkipLw==" - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" - }, - "define-properties": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", - "requires": { - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - } - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==" - }, - "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==", - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" - }, - "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==" - }, - "fast-xml-parser": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.0.3.tgz", - "integrity": "sha512-xhQbg3a/EYNHwK0cxIG1nZmVkHX/0tWihamn5pU4Mhd9KEVE2ga8ZJiqEUgB2sApElvAATOdMTLjgqIpvYDUkQ==", - "requires": { - "strnum": "^1.0.5" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "findup-sync": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", - "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.3", - "micromatch": "^4.0.4", - "resolve-dir": "^1.0.1" - } - }, - "fined": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz", - "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0", - "object.pick": "^1.3.0", - "parse-filepath": "^1.0.2" - } - }, - "flagged-respawn": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz", - "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==" - }, - "flatted": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", - "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==" - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==" - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "requires": { - "for-in": "^1.0.1" - } - }, - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1" - } - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" - }, - "glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "requires": { - "get-intrinsic": "^1.1.1" - } - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "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==" - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" - }, - "hypium": { - "version": "1.0.0", - "resolved": "https://repo.huaweicloud.com/repository/npm/hypium/-/hypium-1.0.0.tgz", - "integrity": "sha512-nl+RQVv2AU/5FvFRhsXyWO5wh+2huhdqRZ3bszBWZzW+kpNI3AT4ydvVRYIfaQbYwV4UlX/rSc7BtFjLAezhow==" - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, - "interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==" - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==" - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" - }, - "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", - "requires": { - "has": "^1.0.3" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==" - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==" - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "requires": { - "minimist": "^1.2.5" - } - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==", - "requires": { - "invert-kv": "^1.0.0" - } - }, - "liftoff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-4.0.0.tgz", - "integrity": "sha512-rMGwYF8q7g2XhG2ulBmmJgWv25qBsqRbDn5gH0+wnuyeFt7QBJlHJmtg5qEdn4pN6WVAUMgXnIxytMFRX9c1aA==", - "requires": { - "extend": "^3.0.2", - "findup-sync": "^5.0.0", - "fined": "^2.0.0", - "flagged-respawn": "^2.0.0", - "is-plain-object": "^5.0.0", - "object.map": "^1.0.1", - "rechoir": "^0.8.0", - "resolve": "^1.20.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "log4js": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz", - "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==", - "requires": { - "date-format": "^4.0.3", - "debug": "^4.3.3", - "flatted": "^3.2.4", - "rfdc": "^1.3.0", - "streamroller": "^3.0.2" - } - }, - "make-iterator": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz", - "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==", - "requires": { - "kind-of": "^6.0.2" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==" - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "requires": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "mute-stdout": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.0.tgz", - "integrity": "sha512-MaSQenn0f9oxIjtCufclpV00MuYTiHaXPbdcfPIM+quMqoa8cXywjHHx4LhhIAZlXqPWMdcUpYviajfmHtHRJw==" - }, - "normalize-package-data": { - "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==", - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "requires": { - "path-key": "^3.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==" - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" - }, - "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", - "requires": { - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "requires": { - "isobject": "^3.0.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==", - "requires": { - "lcid": "^1.0.0" - } - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", - "requires": { - "error-ex": "^1.2.0" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==" - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "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==" - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==" - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "requires": { - "pinkie": "^2.0.0" - } - }, - "pretty-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.0.tgz", - "integrity": "sha512-CU2l5CYUAptUYq/671ajexQfXuxJFwwg0n243Kdkx8bTjeenedsWgu8TGHPm03vLfNtk3aTXgySKPp3Usykudw==" - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "rechoir": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", - "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", - "requires": { - "resolve": "^1.20.0" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==" - }, - "resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", - "requires": { - "is-core-module": "^2.8.1", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-package-path": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-4.0.3.tgz", - "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==", - "requires": { - "path-root": "^0.1.1" - } - }, - "rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "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==", - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" - }, - "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==", - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" - }, - "streamroller": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.1.tgz", - "integrity": "sha512-iPhtd9unZ6zKdWgMeYGfSBuqCngyJy1B/GPi/lTpwGpa3bajuX30GjUVd0/Tn/Xhg0mr4DOSENozz9Y06qyonQ==", - "requires": { - "date-format": "^4.0.10", - "debug": "^4.3.4", - "fs-extra": "^10.1.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "requires": { - "is-utf8": "^0.2.0" - } - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" - }, - "strnum": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", - "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==" - }, - "supports-preserve-symlinks-flag": { - "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==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=" - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "requires": { - "punycode": "^2.1.0" - } - }, - "v8flags": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", - "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==", - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "validate-npm-package-license": { - "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==", - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "y18n": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", - "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" - } - }, - "yargs-parser": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz", - "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==", - "requires": { - "camelcase": "^3.0.0", - "object.assign": "^4.1.0" - } - } - } + "lockfileVersion": 1 } diff --git a/datashare/rdbServer/package.json b/datashare/rdbServer/package.json index ecfe4b36b692d751aaa8ad9f4c3c57cf21c8e7eb..88664404f8d84c8e702f59da254bcce0d947eeb5 100644 --- a/datashare/rdbServer/package.json +++ b/datashare/rdbServer/package.json @@ -1,19 +1,17 @@ { - "license":"ISC", - "devDependencies":{}, - "name":"datasharetest", - "ohos":{ - "org":"huawei", - "directoryLevel":"project", - "buildTool":"hvigor" + "license": "ISC", + "devDependencies": {}, + "keywords": [], + "author": "", + "name": "DataShareTest", + "ohos": { + "org": "huawei", + "directoryLevel": "module", + "buildTool": "hvigor" }, - "description":"example description", - "repository":{}, - "version":"1.0.0", - "dependencies":{ - "@ohos/hypium":"1.0.0", - "@ohos/hvigor-ohos-plugin":"1.1.3", - "hypium":"^1.0.0", - "@ohos/hvigor":"1.1.3" - } -} \ No newline at end of file + "description": "example description", + "main": "hvigorfile.js", + "repository": {}, + "version": "1.0.0", + "dependencies": {} +} diff --git a/datashare/rdbServer/entry/src/main/ets/Application/AbilityStage.ts b/datashare/rdbServer/src/main/ets/Application/AbilityStage.ts similarity index 100% rename from datashare/rdbServer/entry/src/main/ets/Application/AbilityStage.ts rename to datashare/rdbServer/src/main/ets/Application/AbilityStage.ts diff --git a/datashare/rdbServer/entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts b/datashare/rdbServer/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts similarity index 66% rename from datashare/rdbServer/entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts rename to datashare/rdbServer/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts index 40f5413eb20c87fcbb6953b8d6627cce2c3f763a..1c8c8964003077f341126e78a0b48a01126ea81d 100644 --- a/datashare/rdbServer/entry/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts +++ b/datashare/rdbServer/src/main/ets/DataShareExtAbility/DataShareExtAbility.ts @@ -5,15 +5,22 @@ import rdb from '@ohos.data.rdb'; import hilog from '@ohos.hilog'; import featureAbility from '@ohos.ability.featureAbility' import fileIo from '@ohos.fileio' - +import deviceManager from '@ohos.distributedHardware.deviceManager'; +import dataShare from '@ohos.data.dataShare' let DB_NAME = "DB00.db"; let TBL_NAME = "TBL00"; let DDL_TBL_CREATE = "CREATE TABLE IF NOT EXISTS " + TBL_NAME + " (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, age INTEGER, phoneNumber DOUBLE, isStudent BOOLEAN, Binary BINARY)"; +const BUNDLE_NAME = 'com.samples.datasharetest'; + +let dseUri = ("datashare:///com.samples.datasharetest.DataShare"); + let rdbStore; +let result; +let dsHelperr; export default class DataShareExtAbility extends Extension { private rdbStore_; @@ -22,6 +29,8 @@ export default class DataShareExtAbility extends Extension { onCreate(want, callback) { console.log('[ttt] [DataShareTest] <> DataShareExtAbility onCreate, want:' + want.abilityName); console.log('[ttt] [DataShareTest] <> this.context:' + this.context); + result = this.context.cacheDir + '/datashare.txt' + console.info('[ttt] [DataAbilityTest] <> resultpath = ' + result); rdb.getRdbStore(this.context, { name: DB_NAME @@ -32,40 +41,14 @@ export default class DataShareExtAbility extends Extension { rdbStore.executeSql(DDL_TBL_CREATE, [], function (err) { console.log('[ttt] [DataShareTest] <> DataShareExtAbility onCreate, executeSql done err:' + JSON.stringify(err)); }); + rdbStore.setDistributedTables(["TBL00"], (err,data) => { + console.info("[ttt] [DataShareTest] <> setDistributedTables err = " + err); + console.info("[ttt] [DataShareTest] <> setDistributedTables data = " + data); + }); callback(); }); } - getFileTypes(uri: string, mimeTypeFilter: string, callback) { - console.info('[ttt] [DataShareTest] <> [getFileTypes] enter'); - let ret = new Array("type01", "type02", "type03"); - console.info('[ttt] [DataShareTest] <> [getFileTypes] leave, ret:' + ret); - let err = {"code":2}; - callback(err,ret); - return ret; - } - - openFile(uri: string, mode: string, callback) { -// console.info("[ttt] bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb " ); -// console.info('[ttt] [DataAbilityTest] <> DataAbility openFile in'); -// let result = path + '/dataability.txt' -// console.info('[ttt] [DataAbilityTest] <> resultpath = ' + result); -// fileIo.open(result, 0o2 | 0o100, 0o666, function(err, fd) { -// if(err) { -// console.info('[ttt] [DataAbilityTest] <> OpenFile err = ' + err); -// console.info('[ttt] [DataAbilityTest] <> OpenFile err = ' + JSON.stringify(err)); -// } -// fd1 = fd; -// console.log('[ttt] [DataAbilityTest] <> EtsFileIo fd =' + fd); -// console.info("[ttt] ccccccccccccccccccccccccccccccccccccccccc " ); -// let num = fileIo.writeSync(fd, "this is a interesting test of DataAbility from the Great RPF"); -// console.info("[ttt] [DataAbillityTest] <> WriteSync length = " + num); -// console.info("[ttt] [DataAbillityTest] <> WriteSync fd = " + fd); -// -// callback(err,fd); -// }) - } - async insert(uri, value, callback) { console.info('[ttt] [DataShareTest] <> [insert] enter'); if (value == null) { @@ -80,7 +63,16 @@ export default class DataShareExtAbility extends Extension { callback(err, ret); } }); - console.info('[ttt] [DataShareTest] <> [insert] leave'); + dataShare.createDataShareHelper(this.context, dseUri, (err,data)=>{ + console.info("[ttt] [DataShareTest] <> -- insert --, globalThis.dsHelper = " + dsHelperr); + console.info("[ttt] [DataShareTest] <> -- insert --, data = " + data); + console.info("[ttt] [DataShareTest] <> -- insert --, err = " + err); + console.info("[ttt] [DataShareTest] <> -- insert --, JSON.stringify(err) = " + JSON.stringify(err)); + data.notifyChange(dseUri,(err,data) => { + console.log("[ttt] [DataShareClientTest] <> insert notifyChange = " + data); + console.log("[ttt] [DataShareClientTest] <> insert notifyChange json= " + JSON.stringify(data)); + }) + }); } update(uri, predicates, value, callback) { @@ -104,6 +96,16 @@ export default class DataShareExtAbility extends Extension { } catch (err) { console.error('[ttt] [DataShareTest] <> [update] error' + err); } + dataShare.createDataShareHelper(this.context, dseUri, (err,data)=>{ + console.info("[ttt] [DataShareTest] <> -- update --, globalThis.dsHelper = " + dsHelperr); + console.info("[ttt] [DataShareTest] <> -- update --, data = " + data); + console.info("[ttt] [DataShareTest] <> -- update --, err = " + err); + console.info("[ttt] [DataShareTest] <> -- update --, JSON.stringify(err) = " + JSON.stringify(err)); + data.notifyChange(dseUri,(err,data) => { + console.log("[ttt] [DataShareClientTest] <> update notifyChange = " + data); + console.log("[ttt] [DataShareClientTest] <> update notifyChange json= " + JSON.stringify(data)); + }) + }); console.info('[ttt] [DataShareTest] <> [update] leave'); } @@ -125,6 +127,16 @@ export default class DataShareExtAbility extends Extension { } catch (err) { console.error('[ttt] [DataShareTest] <> [delete] error' + err); } + dataShare.createDataShareHelper(this.context, dseUri, (err,data)=>{ + console.info("[ttt] [DataShareTest] <> -- delete --, globalThis.dsHelper = " + dsHelperr); + console.info("[ttt] [DataShareTest] <> -- delete --, data = " + data); + console.info("[ttt] [DataShareTest] <> -- delete --, err = " + err); + console.info("[ttt] [DataShareTest] <> -- delete --, JSON.stringify(err) = " + JSON.stringify(err)); + data.notifyChange(dseUri,(err,data) => { + console.log("[ttt] [DataShareClientTest] <> delete notifyChange = " + data); + console.log("[ttt] [DataShareClientTest] <> delete notifyChange json= " + JSON.stringify(data)); + }) + }); console.info('[ttt] [DataShareTest] <> [delete] leave'); } @@ -147,21 +159,19 @@ export default class DataShareExtAbility extends Extension { callback(err, resultSet); } }); + console.info('[ttt] [DataShareTest] <> [insert] leave'); } catch (err) { console.error('[ttt] [DataShareTest] <> [query] error' + err); } + rdbStore.sync(rdb.SyncMode.SYNC_MODE_PUSH,predicates,(err,data) => { + if(err) { + console.info("[ttt] [DataShareTest] <> [sync] err = " + err); + } + console.info("[ttt] [DataShareTest] <> [sync] data = " + JSON.stringify(data)); + }) console.info('[ttt] [DataShareTest] <> [query] leave'); } - getType(uri: string,callback) { - console.info('[ttt] [DataShareTest] <> [getType] enter'); - let ret = "image"; - console.info('[ttt] [DataShareTest] <> [getType] leave, ret:' + ret); - let err = {"code":0}; - callback(err,ret); - return ret; - } - batchInsert(uri: string, valueBuckets, callback) { console.info('[ttt] [DataShareTest] <> [batchInsert] enter'); if (valueBuckets == null || valueBuckets.length == undefined) { @@ -182,14 +192,47 @@ export default class DataShareExtAbility extends Extension { console.info('[ttt] [DataShareTest] <> [batchInsert] leave'); } + getType(uri: string,callback) { + console.info('[ttt] [DataShareTest] <> [getType] enter'); + let ret = "image"; + console.info('[ttt] [DataShareTest] <> [getType] leave, ret:' + ret); + let err = {"code":0}; + callback(err,ret); + return ret; + } + + getFileTypes(uri: string, mimeTypeFilter: string, callback) { + console.info('[ttt] [DataShareTest] <> [getFileTypes] enter'); + let ret = new Array("type01", "type02", "type03"); + console.info('[ttt] [DataShareTest] <> [getFileTypes] leave, ret:' + ret); + let err = {"code":2}; + callback(err,ret); + return ret; + } + + openFile(uri: string, mode: string, callback) { + console.info('[ttt] [DataAbilityTest] <> DataAbility openFile in'); + fileIo.open(result, 0o2 | 0o100, 0o666, function(err, fd) { + if(err) { + console.info('[ttt] [DataAbilityTest] <> OpenFile err = ' + err); + console.info('[ttt] [DataAbilityTest] <> OpenFile err = ' + JSON.stringify(err)); + } + console.log('[ttt] [DataAbilityTest] <> EtsFileIo fd =' + fd); + let num = fileIo.writeSync(fd, "this is a interesting test of DataAbility from the Great RPF"); + console.info("[ttt] [DataAbillityTest] <> WriteSync length = " + num); + console.info("[ttt] [DataAbillityTest] <> WriteSync fd = " + fd); + callback(err,fd); + }) + } + normalizeUri(uri: string,callback) { console.info('[ttt] [DataShareTest] <> [normalizeUri] enter'); let ret = "normalize+" + uri; console.info('[ttt] [DataShareTest] <> [normalizeUri] leave, ret:' + ret); let err = {"code":2}; - console.info('[ttt] [DataShareTest] <> [normalizeUri] enter!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'); + console.info('[ttt] [DataShareTest] <> [normalizeUri] enter!!!'); callback(err,ret); - console.info('[ttt] [DataShareTest] <> [normalizeUri] leave!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'); + console.info('[ttt] [DataShareTest] <> [normalizeUri] leave!!!'); } denormalizeUri(uri: string,callback) { diff --git a/datashare/rdbServer/entry/src/main/ets/MainAbility/MainAbility.ts b/datashare/rdbServer/src/main/ets/MainAbility/MainAbility.ts similarity index 91% rename from datashare/rdbServer/entry/src/main/ets/MainAbility/MainAbility.ts rename to datashare/rdbServer/src/main/ets/MainAbility/MainAbility.ts index 1eb38455d80ba75c33bfc3a16fe4690d32cdde28..16b642624db55cc5654ed888b6acad953a423d43 100644 --- a/datashare/rdbServer/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/datashare/rdbServer/src/main/ets/MainAbility/MainAbility.ts @@ -2,6 +2,8 @@ import Ability from '@ohos.application.Ability' import ability_particleAbility from '@ohos.ability.particleAbility' import dataSharePredicates from '@ohos.data.dataSharePredicates' import dataShare from '@ohos.data.dataShare' +import featureAbility from '@ohos.ability.featureAbility' + import dataAbility from '@ohos.data.dataAbility' import rdb from '@ohos.data.rdb'; @@ -101,8 +103,12 @@ export default class MainAbility extends Ability { // Main window is created, set main page for this ability console.log("[ttt] [DataShareTest] <> MainAbility onWindowStageCreate") globalThis.abilityContext = this.context; - let context = this.context; + + context.requestPermissionsFromUser(['ohos.permission.DISTRIBUTED_DATASYNC'], function (err,result) { + console.info("[ttt] [DataShareTest] <> permission err = " + JSON.stringify(err)) + console.info("[ttt] [DataShareTest] <> permission result = " + JSON.stringify(result)) + }) // console.log('[ttt] [DataShareTest] <> MainAbility onWindowStageCreate this.context.stageMode:' + context.stageMode); // console.log('[ttt] [DataShareTest] <> MainAbility onWindowStageCreate this.context.bundleName:' + context.bundleName); // console.log('[ttt] [DataShareTest] <> MainAbility onWindowStageCreate this.context.name:' + context.name); @@ -181,17 +187,6 @@ export default class MainAbility extends Ability { console.log("[ttt] [DataShareTest] <> off end"); }) - // globalThis.openFile = (async () => { - // console.log("[ttt] [DataShareTest] <> openFile begin"); - // if (globalThis.dsHelper == null) { - // console.log("[ttt] [DataShareTest] <> openFile end, DSHelper is null"); - // return; - // } - // let result = await globalThis.dsHelper.openFile(dseUri, "rwt"); - // console.log("[ttt] [DataShareTest] <> openFile end, result:" + result); - // return result; - // }) - globalThis.query = (async () => { console.log("[ttt] [DataShareTest] <> query begin"); let da = new dataSharePredicates.DataSharePredicates(); @@ -204,7 +199,8 @@ export default class MainAbility extends Ability { console.log("[ttt] [DataShareTest] <> query end, DSHelper is null"); return; } - da.equalTo("name", "ZhangSan"); + da.notEqualTo("$.name", "rpf"); + da.limit(1,0); let result = await globalThis.dsHelper.query(dseUri, da, ["*"], (err,resultSet)=> { if (err) { console.error("[ttt] [DataShareTest] <> query err:" + JSON.stringify(err)); @@ -331,17 +327,24 @@ export default class MainAbility extends Ability { }) globalThis.notifyChange = (async () => { -// console.log("[ttt] [DataShareTest] <> notifyChange begin"); -// if (globalThis.dsHelper == null) { -// console.log("[ttt] [DataShareTest] <> notifyChange end, DSHelper is null"); -// return; -// } -// await globalThis.dsHelper.notifyChange(dseUri); -// console.log("[ttt] [DataShareTest] <> notifyChange end"); - await globalThis.dsHelper.openFile(dseUri,"rwt",(err,data) => { - console.info("[ttt] [DataShareTest] <> openFile end, da is" + data); - }); + console.log("[ttt] [DataShareTest] <> notifyChange begin"); + if (globalThis.dsHelper == null) { + console.log("[ttt] [DataShareTest] <> notifyChange end, DSHelper is null"); + return; + } + await globalThis.dsHelper.notifyChange(dseUri); + console.log("[ttt] [DataShareTest] <> notifyChange end"); + }) + globalThis.openFile = (async () => { + console.log("[ttt] [DataShareTest] <> openFile begin"); + if (globalThis.dsHelper == null) { + console.log("[ttt] [DataShareTest] <> openFile end, DSHelper is null"); + return; + } + let result = await globalThis.dsHelper.openFile(dseUri, "rwt"); + console.log("[ttt] [DataShareTest] <> openFile end, result:" + result); + return result; }) globalThis.getType = (async () => { diff --git a/datashare/rdbServer/entry/src/main/ets/pages/index.ets b/datashare/rdbServer/src/main/ets/pages/index.ets similarity index 81% rename from datashare/rdbServer/entry/src/main/ets/pages/index.ets rename to datashare/rdbServer/src/main/ets/pages/index.ets index 173b66c0d198798dd10f16e8c7c651e25d1ba450..47c4656fcf7d70f293b019eadef4df7d5f688cff 100644 --- a/datashare/rdbServer/entry/src/main/ets/pages/index.ets +++ b/datashare/rdbServer/src/main/ets/pages/index.ets @@ -10,7 +10,7 @@ struct Index { build() { Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { Text('DataShare Extension Ability Test') - .fontSize(40) + .fontSize(25) .fontWeight(FontWeight.Bold) .onClick(async () => { console.info('[ttt] [DataShareTest] <> dataSharePredicates build begin'); @@ -54,44 +54,6 @@ struct Index { .width('100%') .textAlign(TextAlign.Center) -// Row() { -// Button() { -// Text('ConnectServiceExtension') -// .fontSize(25) -// .fontWeight(FontWeight.Bold) -// }.type(ButtonType.Capsule) -// .margin({ -// top: 20 -// }) -// .width('45%') -// .height('8%') -// .backgroundColor('#0ddffb') -// .onClick(async () => { -// console.info('[ttt] [DataShareTest] <> ConnectServiceExtension onclick enter') -// this.message = 'ConnectServiceExtension onclick' -// globalThis.connectServiceExtAbility() -// console.info('[ttt] [DataShareTest] <> ConnectServiceExtension onclick leave') -// }) -// -// Button() { -// Text('DisconnectServiceExtension') -// .fontSize(25) -// .fontWeight(FontWeight.Bold) -// }.type(ButtonType.Capsule) -// .margin({ -// top: 20 -// }) -// .width('45%') -// .height('8%') -// .backgroundColor('#0ddffb') -// .onClick(async () => { -// console.info('[ttt] [DataShareTest] <> DisconnectServiceExtension onclick enter') -// this.message = 'DisconnectServiceExtension onclick' -// globalThis.disconnectServiceExtAbility() -// console.info('[ttt] [DataShareTest] <> DisconnectServiceExtension onclick leave') -// }) -// } - Row() { Button() { Text('Connect') @@ -175,24 +137,25 @@ struct Index { console.info('[ttt] [DataShareTest] <> Off onclick leave') }) -// Button() { -// Text('OpenFile') -// .fontSize(25) -// .fontWeight(FontWeight.Bold) -// }.type(ButtonType.Capsule) -// .margin({ -// top: 20 -// }) -// .width('30%') -// .height('8%') -// .backgroundColor('#0ddffb') -// .onClick(async () => { -// console.info('[ttt] [DataShareTest] <> OpenFile onclick enter') -// this.message = 'OpenFile onclick' -// let ret = await globalThis.openFile() -// this.message += "\n\n Test Result: " + ret; -// console.info('[ttt] [DataShareTest] <> OpenFile onclick leave') -// }) + Button() { + Text('OpenFile') + .fontSize(25) + .fontWeight(FontWeight.Bold) + }.type(ButtonType.Capsule) + .margin({ + top: 20 + }) + .width('30%') + .height('8%') + .backgroundColor('#0ddffb') + .onClick(async () => { + console.info('[ttt] [DataShareTest] <> OpenFile onclick enter') + this.message = 'OpenFile onclick' + let ret = await globalThis.openFile() + console.info('[ttt] [DataShareTest] <> OpenFile onclick ret = ' + ret); + this.message += "\n\n Test Result: " + ret; + console.info('[ttt] [DataShareTest] <> OpenFile onclick leave') + }) } Row() { diff --git a/datashare/rdbServer/entry/src/main/module.json5 b/datashare/rdbServer/src/main/module.json5 similarity index 90% rename from datashare/rdbServer/entry/src/main/module.json5 rename to datashare/rdbServer/src/main/module.json5 index 21058abc284a2945703861299276e1f0262801ab..dbadcb1da12d1eae095e62604dbf986b5430128c 100644 --- a/datashare/rdbServer/entry/src/main/module.json5 +++ b/datashare/rdbServer/src/main/module.json5 @@ -46,6 +46,11 @@ "uri": "datashare://com.samples.datasharetest.DataShare", "visible": true } + ], + "requestPermissions": [ + { + "name" : "ohos.permission.DISTRIBUTED_DATASYNC" + } ] // "requestPermissions": [ // { diff --git a/datashare/rdbServer/entry/src/main/resources/base/element/datashare.json b/datashare/rdbServer/src/main/resources/base/element/datashare.json similarity index 100% rename from datashare/rdbServer/entry/src/main/resources/base/element/datashare.json rename to datashare/rdbServer/src/main/resources/base/element/datashare.json diff --git a/datashare/rdbServer/entry/src/main/resources/base/element/string.json b/datashare/rdbServer/src/main/resources/base/element/string.json similarity index 100% rename from datashare/rdbServer/entry/src/main/resources/base/element/string.json rename to datashare/rdbServer/src/main/resources/base/element/string.json diff --git a/datashare/rdbServer/entry/src/main/resources/base/media/icon.png b/datashare/rdbServer/src/main/resources/base/media/icon.png similarity index 100% rename from datashare/rdbServer/entry/src/main/resources/base/media/icon.png rename to datashare/rdbServer/src/main/resources/base/media/icon.png diff --git a/datashare/rdbServer/entry/src/main/resources/base/profile/form_config.json b/datashare/rdbServer/src/main/resources/base/profile/form_config.json similarity index 100% rename from datashare/rdbServer/entry/src/main/resources/base/profile/form_config.json rename to datashare/rdbServer/src/main/resources/base/profile/form_config.json diff --git a/datashare/rdbServer/entry/src/main/resources/base/profile/main_pages.json b/datashare/rdbServer/src/main/resources/base/profile/main_pages.json similarity index 100% rename from datashare/rdbServer/entry/src/main/resources/base/profile/main_pages.json rename to datashare/rdbServer/src/main/resources/base/profile/main_pages.json