@o3r/workspace 11.0.0-prerelease.9 → 11.0.0-rc.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/package.json +55 -50
  2. package/schematics/library/rules/shared.d.ts.map +1 -1
  3. package/schematics/library/rules/shared.js +0 -2
  4. package/schematics/library/rules/shared.js.map +1 -1
  5. package/schematics/ng-add/helpers/npm-workspace.js +1 -0
  6. package/schematics/ng-add/helpers/npm-workspace.js.map +1 -1
  7. package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template +0 -3
  8. package/schematics/sdk/rules/update-ts-paths.rule.js +1 -1
  9. package/schematics/sdk/rules/update-ts-paths.rule.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@o3r/workspace",
3
- "version": "11.0.0-prerelease.9",
3
+ "version": "11.0.0-rc.10",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -22,14 +22,14 @@
22
22
  "main": "./src/public_api.js",
23
23
  "types": "./src/public_api.d.ts",
24
24
  "peerDependencies": {
25
- "@angular-devkit/architect": "~0.1703.0",
26
- "@angular-devkit/core": "~17.3.0",
27
- "@angular-devkit/schematics": "~17.3.0",
28
- "@angular/cli": "~17.3.0",
29
- "@angular/common": "~17.3.0",
30
- "@angular/compiler-cli": "~17.3.0",
31
- "@angular/core": "~17.3.0",
32
- "@schematics/angular": "~17.3.0",
25
+ "@angular-devkit/architect": "~0.1800.0",
26
+ "@angular-devkit/core": "~18.0.0",
27
+ "@angular-devkit/schematics": "~18.0.0",
28
+ "@angular/cli": "~18.0.0",
29
+ "@angular/common": "~18.0.0",
30
+ "@angular/compiler-cli": "~18.0.0",
31
+ "@angular/core": "~18.0.0",
32
+ "@schematics/angular": "~18.0.0",
33
33
  "typescript": "~5.4.2"
34
34
  },
35
35
  "peerDependenciesMeta": {
@@ -38,65 +38,66 @@
38
38
  }
39
39
  },
40
40
  "dependencies": {
41
- "@o3r/schematics": "^11.0.0-prerelease.9",
41
+ "@o3r/schematics": "^11.0.0-rc.10",
42
42
  "commander": "^12.0.0",
43
43
  "globby": "^11.1.0",
44
44
  "semver": "^7.5.2",
45
45
  "tslib": "^2.6.2",
46
- "uuid": "^9.0.0",
46
+ "uuid": "^10.0.0",
47
47
  "winston": "^3.8.2"
48
48
  },
49
49
  "devDependencies": {
50
- "@angular-devkit/architect": "~0.1703.0",
51
- "@angular-devkit/build-angular": "~17.3.0",
52
- "@angular-devkit/core": "~17.3.0",
53
- "@angular-devkit/schematics": "~17.3.0",
54
- "@angular-eslint/eslint-plugin": "~17.5.0",
55
- "@angular/animations": "~17.3.0",
56
- "@angular/cli": "~17.3.0",
57
- "@angular/common": "~17.3.0",
58
- "@angular/compiler": "~17.3.0",
59
- "@angular/compiler-cli": "~17.3.0",
60
- "@angular/core": "~17.3.0",
61
- "@angular/platform-browser": "~17.3.0",
62
- "@angular/platform-browser-dynamic": "~17.3.0",
63
- "@angular/router": "~17.3.0",
50
+ "@angular-devkit/architect": "~0.1800.0",
51
+ "@angular-devkit/build-angular": "~18.0.0",
52
+ "@angular-devkit/core": "~18.0.0",
53
+ "@angular-devkit/schematics": "~18.0.0",
54
+ "@angular-eslint/eslint-plugin": "~18.0.0",
55
+ "@angular/animations": "~18.0.0",
56
+ "@angular/cli": "~18.0.0",
57
+ "@angular/common": "~18.0.0",
58
+ "@angular/compiler": "~18.0.0",
59
+ "@angular/compiler-cli": "~18.0.0",
60
+ "@angular/core": "~18.0.0",
61
+ "@angular/platform-browser": "~18.0.0",
62
+ "@angular/platform-browser-dynamic": "~18.0.0",
63
+ "@angular/router": "~18.0.0",
64
64
  "@babel/core": "~7.24.0",
65
65
  "@babel/preset-typescript": "~7.24.0",
66
- "@ngrx/entity": "~17.2.0",
67
- "@ngrx/store": "~17.2.0",
68
- "@nx/eslint": "~18.3.0",
69
- "@nx/eslint-plugin": "~18.3.0",
70
- "@nx/jest": "~18.3.0",
71
- "@nx/js": "~18.3.0",
72
- "@o3r/build-helpers": "^11.0.0-prerelease.9",
73
- "@o3r/core": "^11.0.0-prerelease.9",
74
- "@o3r/eslint-plugin": "^11.0.0-prerelease.9",
75
- "@o3r/schematics": "^11.0.0-prerelease.9",
76
- "@o3r/test-helpers": "^11.0.0-prerelease.9",
77
- "@schematics/angular": "~17.3.0",
78
- "@stylistic/eslint-plugin-ts": "^1.5.4",
66
+ "@ngrx/entity": "~18.0.0",
67
+ "@ngrx/store": "~18.0.0",
68
+ "@nx/eslint": "~19.3.0",
69
+ "@nx/eslint-plugin": "~19.3.0",
70
+ "@nx/jest": "~19.3.0",
71
+ "@nx/js": "~19.3.0",
72
+ "@o3r/build-helpers": "^11.0.0-rc.10",
73
+ "@o3r/core": "^11.0.0-rc.10",
74
+ "@o3r/eslint-plugin": "^11.0.0-rc.10",
75
+ "@o3r/schematics": "^11.0.0-rc.10",
76
+ "@o3r/test-helpers": "^11.0.0-rc.10",
77
+ "@schematics/angular": "~18.0.0",
78
+ "@stylistic/eslint-plugin-ts": "^2.0.0",
79
79
  "@types/jest": "~29.5.2",
80
80
  "@types/minimist": "^1.2.2",
81
81
  "@types/node": "^20.0.0",
82
82
  "@types/pid-from-port": "^1.1.0",
83
83
  "@types/semver": "^7.3.13",
84
84
  "@types/uuid": "^9.0.0",
85
- "@typescript-eslint/eslint-plugin": "^7.2.0",
86
- "@typescript-eslint/parser": "^7.2.0",
85
+ "@typescript-eslint/eslint-plugin": "^7.14.1",
86
+ "@typescript-eslint/parser": "^7.14.1",
87
+ "@typescript-eslint/utils": "^7.14.1",
87
88
  "cpy-cli": "^5.0.0",
88
89
  "eslint": "^8.57.0",
89
90
  "eslint-import-resolver-node": "^0.3.9",
90
- "eslint-plugin-jest": "~27.9.0",
91
- "eslint-plugin-jsdoc": "~48.2.1",
91
+ "eslint-plugin-jest": "~28.6.0",
92
+ "eslint-plugin-jsdoc": "~48.4.0",
92
93
  "eslint-plugin-prefer-arrow": "~1.2.3",
93
- "eslint-plugin-unicorn": "^51.0.1",
94
+ "eslint-plugin-unicorn": "^54.0.0",
94
95
  "jest": "~29.7.0",
95
96
  "jest-environment-jsdom": "~29.7.0",
96
97
  "jest-junit": "~16.0.0",
97
98
  "jest-preset-angular": "~14.1.0",
98
99
  "minimist": "^1.2.6",
99
- "nx": "~18.3.0",
100
+ "nx": "~19.3.0",
100
101
  "pid-from-port": "^1.1.3",
101
102
  "rxjs": "^7.8.1",
102
103
  "ts-jest": "~29.1.2",
@@ -106,13 +107,13 @@
106
107
  "zone.js": "~0.14.2"
107
108
  },
108
109
  "generatorDependencies": {
109
- "@angular/material": "~17.3.0",
110
- "@ngrx/router-store": "~17.2.0",
111
- "@ngrx/effects": "~17.2.0",
112
- "@ngrx/store-devtools": "~17.2.0"
110
+ "@angular/material": "~18.0.0",
111
+ "@ngrx/router-store": "~18.0.0",
112
+ "@ngrx/effects": "~18.0.0",
113
+ "@ngrx/store-devtools": "~18.0.0"
113
114
  },
114
115
  "engines": {
115
- "node": ">=18.0.0"
116
+ "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
116
117
  },
117
118
  "schematics": "./collection.json",
118
119
  "builders": "./builders.json",
@@ -151,6 +152,7 @@
151
152
  },
152
153
  {
153
154
  "name": "Stephane Dalle",
155
+ "url": "https://github.com/sdalle-1A",
154
156
  "email": "sdalle-1A@users.noreply.github.com"
155
157
  },
156
158
  {
@@ -185,7 +187,10 @@
185
187
  }
186
188
  ],
187
189
  "bugs": "https://github.com/AmadeusITGroup/otter/issues",
188
- "repository": "https://github.com/AmadeusITGroup/otter",
190
+ "repository": {
191
+ "type": "git",
192
+ "url": "git+https://github.com/AmadeusITGroup/otter.git"
193
+ },
189
194
  "license": "BSD-3-Clause",
190
195
  "homepage": "https://amadeusitgroup.github.io/otter/"
191
196
  }
package/schematics/library/rules/shared.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAGnD;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAC,EACnF,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAuDzC;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}
1
+ {"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAGnD;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC5C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,WAAW,GAAG;IAAE,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAC,EACnF,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAqDzC;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAQ/D"}
package/schematics/library/rules/shared.js CHANGED
@@ -39,8 +39,6 @@ function updatePackageDependenciesFactory(targetPath, otterVersion, o3rCorePacka
39
39
  '@angular/core': packageJson.peerDependencies['@angular/common'],
40
40
  '@angular/platform-browser': packageJson.peerDependencies['@angular/common'],
41
41
  '@angular/platform-browser-dynamic': packageJson.peerDependencies['@angular/common'],
42
- '@o3r/core': otterVersion,
43
- '@o3r/eslint-plugin': otterVersion,
44
42
  '@schematics/angular': o3rCorePackageJson.peerDependencies['@schematics/angular'],
45
43
  '@types/jest': o3rCorePackageJson.generatorDependencies['@types/jest'],
46
44
  '@typescript-eslint/eslint-plugin': o3rCorePackageJson.generatorDependencies['@typescript-eslint/parser'],
package/schematics/library/rules/shared.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../schematics/library/rules/shared.ts"],"names":[],"mappings":"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"}
package/schematics/ng-add/helpers/npm-workspace.js CHANGED
@@ -17,6 +17,7 @@ function addWorkspacesToProject(directories = schematics_3.DEFAULT_ROOT_FOLDERS)
17
17
  throw new schematics_2.SchematicsException('Root package.json does not exist');
18
18
  }
19
19
  const rootPackageJsonObject = tree.readJson(rootPackageJsonPath);
20
+ rootPackageJsonObject.version = '0.0.0-placeholder';
20
21
  // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
21
22
  rootPackageJsonObject.workspaces = [...new Set(Object.values(directories).map(d => `${d}/*`).concat(rootPackageJsonObject.workspaces || []))];
22
23
  tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
package/schematics/ng-add/helpers/npm-workspace.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"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"}
package/schematics/ng-add/helpers/renovate/templates/__dot__renovaterc.json.template CHANGED
@@ -14,9 +14,6 @@
14
14
  "enabledManagers": [
15
15
  "npm"
16
16
  ],
17
- "npm": {
18
- "stabilityDays": 0
19
- },
20
17
  "labels": [
21
18
  "upgrade"
22
19
  ],
package/schematics/sdk/rules/update-ts-paths.rule.js CHANGED
@@ -25,8 +25,8 @@ function updateTsConfig(targetPath, projectName, scope) {
25
25
  context.logger.warn('No tsconfig found, the path mapping will not be updated');
26
26
  return tree;
27
27
  }
28
- configWithPath.content.baseUrl ||= '.';
29
28
  configWithPath.content.compilerOptions ||= {};
29
+ configWithPath.content.compilerOptions.baseUrl ||= '.';
30
30
  configWithPath.content.compilerOptions.paths ||= {};
31
31
  configWithPath.content.compilerOptions.paths[`${scope ? `@${scope}/` : ''}${projectName}`] = [
32
32
  `${relativeTargetPath}/dist`,
package/schematics/sdk/rules/update-ts-paths.rule.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,UAAkB,EAAE,WAAmB,EAAE,KAAa;IACnF,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEzD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,SAAS;aACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,QAAQ;YACR,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,cAAc,CAAC,OAAO,CAAC,OAAO,KAAK,GAAG,CAAC;QACvC,cAAc,CAAC,OAAO,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE,CAAC;QACpD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,GAAG;YAC3F,GAAG,kBAAkB,OAAO;YAC5B,GAAG,kBAAkB,YAAY;SAClC,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,WAAW,CAAC,GAAG;YACpG,GAAG,kBAAkB,oBAAoB;SAC1C,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,IAAI,CAAC,GAAG;YAC7F,GAAG,kBAAkB,SAAS;YAC9B,GAAG,kBAAkB,QAAQ;SAC9B,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAtCD,wCAsCC"}
1
+ {"version":3,"file":"update-ts-paths.rule.js","sourceRoot":"","sources":["../../../../schematics/sdk/rules/update-ts-paths.rule.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,UAAkB,EAAE,WAAmB,EAAE,KAAa;IACnF,MAAM,SAAS,GAAG,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,eAAe,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAEzD,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,OAAO,GAAG,SAAS;aACtB,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aAC3C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAClB,QAAQ;YACR,OAAO,EAAE,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,cAAc,CAAC,OAAO,CAAC,eAAe,KAAK,EAAE,CAAC;QAC9C,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,KAAK,GAAG,CAAC;QACvD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,KAAK,EAAE,CAAC;QACpD,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,EAAE,CAAC,GAAG;YAC3F,GAAG,kBAAkB,OAAO;YAC5B,GAAG,kBAAkB,YAAY;SAClC,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,WAAW,CAAC,GAAG;YACpG,GAAG,kBAAkB,oBAAoB;SAC1C,CAAC;QACF,cAAc,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,IAAI,CAAC,GAAG;YAC7F,GAAG,kBAAkB,SAAS;YAC9B,GAAG,kBAAkB,QAAQ;SAC9B,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAtCD,wCAsCC"}