Merge branch 'master' of https://bentleycs.visualstudio.com/iModelTec…

…hnologies/_git/imodeljs into ECDbIncreaseTestCoverage
KrishKash · Jun 11, 2019 · ae63717 · ae63717
2 parents 6c455f5 + b2581a1
commit ae63717
Show file tree

Hide file tree

Showing 115 changed files with 1,528 additions and 722 deletions.
diff --git a/.vscode/cSpell.json b/.vscode/cSpell.json
@@ -138,6 +138,7 @@
         "Nums",
         "Obscurable",
         "oldcolor",
+        "overclamped",
         "overriden",
         "pageable",
         "parallelized",
@@ -167,6 +168,7 @@
         "renderable",
         "Renormalize",
         "Resizer",
+        "roadmap",
         "ruleset",
         "rulesets",
         "selectable",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -153,6 +153,7 @@
     "numericinput",
     "numeronyms",
     "oldcolor",
+    "overclamped",
     "pageable",
     "parallelized",
     "parameterizations",
@@ -169,6 +170,7 @@
     "reflectivity",
     "reinstatable",
     "renderable",
+    "roadmap",
     "ruleset",
     "rulesets",
     "skybox",

diff --git a/common/api/geometry-core.api.md b/common/api/geometry-core.api.md
@@ -188,7 +188,7 @@ export class Arc3d extends CurvePrimitive implements BeJSONFunctions {
     clone(): Arc3d;
     clonePartialCurve(fractionA: number, fractionB: number): CurvePrimitive | undefined;
     cloneTransformed(transform: Transform): CurvePrimitive;
-    closestPoint(spacePoint: Point3d, extend: boolean, result?: CurveLocationDetail): CurveLocationDetail;
+    closestPoint(spacePoint: Point3d, extend: VariantCurveExtendParameter, result?: CurveLocationDetail): CurveLocationDetail;
     computeStrokeCountForOptions(options?: StrokeOptions): number;
     static create(center: Point3d, vector0: Vector3d, vector90: Vector3d, sweep?: AngleSweep, result?: Arc3d): Arc3d;
     static createCenterNormalRadius(center: Point3d, normal: Vector3d, radius: number, result?: Arc3d): Arc3d;
@@ -1141,7 +1141,7 @@ export class CurveChainWithDistanceIndex extends CurvePrimitive {
     protected chainDistanceToFragment(distance: number, allowExtrapolation?: boolean): PathFragment | undefined;
     clone(): CurvePrimitive | undefined;
     cloneTransformed(transform: Transform): CurvePrimitive | undefined;
-    closestPoint(spacePoint: Point3d, _extend: boolean): CurveLocationDetail | undefined;
+    closestPoint(spacePoint: Point3d, extend: VariantCurveExtendParameter): CurveLocationDetail | undefined;
     computeAndAttachRecursiveStrokeCounts(options?: StrokeOptions, parentStrokeMap?: StrokeCountMap): void;
     computeStrokeCountForOptions(options?: StrokeOptions): number;
     static createCapture(path: CurveChain, options?: StrokeOptions): CurveChainWithDistanceIndex | undefined;
@@ -1203,6 +1203,20 @@ export enum CurveCurveApproachType {
     PerpendicularChord = 1
 }
 
+// @public
+export enum CurveExtendMode {
+    None = 0,
+    OnCurve = 2,
+    OnTangent = 1
+}
+
+// @public
+export class CurveExtendOptions {
+    static correctFraction(extendParam: VariantCurveExtendParameter, fraction: number): number;
+    static resolveRadiansToSweepFraction(extendParam: VariantCurveExtendParameter, radians: number, sweep: AngleSweep): number;
+    static resolveVariantCurveExtendParameterToCurveExtendMode(param: VariantCurveExtendParameter, endIndex: 0 | 1): CurveExtendMode;
+}
+
 // @public
 export enum CurveIntervalRole {
     intervalEnd = 12,
@@ -1266,7 +1280,7 @@ export abstract class CurvePrimitive extends GeometryQuery {
     announceClipIntervals(_clipper: Clipper, _announce?: AnnounceNumberNumberCurvePrimitive): boolean;
     appendPlaneIntersectionPoints(plane: PlaneAltitudeEvaluator, result: CurveLocationDetail[]): number;
     clonePartialCurve(_fractionA: number, _fractionB: number): CurvePrimitive | undefined;
-    closestPoint(spacePoint: Point3d, extend: boolean): CurveLocationDetail | undefined;
+    closestPoint(spacePoint: Point3d, extend: VariantCurveExtendParameter): CurveLocationDetail | undefined;
     computeAndAttachRecursiveStrokeCounts(options?: StrokeOptions, parentMap?: StrokeCountMap): void;
     abstract computeStrokeCountForOptions(options?: StrokeOptions): number;
     curveLength(): number;
@@ -2162,7 +2176,7 @@ export class LineSegment3d extends CurvePrimitive implements BeJSONFunctions {
     clone(): LineSegment3d;
     clonePartialCurve(fractionA: number, fractionB: number): CurvePrimitive | undefined;
     cloneTransformed(transform: Transform): CurvePrimitive;
-    closestPoint(spacePoint: Point3d, extend: boolean, result?: CurveLocationDetail): CurveLocationDetail;
+    closestPoint(spacePoint: Point3d, extend: VariantCurveExtendParameter, result?: CurveLocationDetail): CurveLocationDetail;
     computeStrokeCountForOptions(options?: StrokeOptions): number;
     static create(point0: Point3d, point1: Point3d, result?: LineSegment3d): LineSegment3d;
     static createXYXY(x0: number, y0: number, x1: number, y1: number, z?: number, result?: LineSegment3d): LineSegment3d;
@@ -4293,6 +4307,9 @@ export class UVSurfaceOps {
     static createLinestringOnUVLine(surface: UVSurface, u0: number, v0: number, u1: number, v1: number, numEdge: number, saveUV?: boolean, saveFraction?: boolean): LineString3d;
 }
 
+// @public
+export type VariantCurveExtendParameter = boolean | CurveExtendMode | CurveExtendMode[];
+
 // @public
 export class Vector2d extends XY implements BeJSONFunctions {
     constructor(x?: number, y?: number);

diff --git a/common/api/imodeljs-backend.api.md b/common/api/imodeljs-backend.api.md
@@ -1361,6 +1361,10 @@ export class ExternalSourceAspect extends ElementMultiAspect implements External
     checksum: string;
     // @internal (undocumented)
     static readonly className: string;
+    // @alpha
+    static createPropsForElement(sourceElement: Element, targetScopeElementId: Id64String, targetElementId: Id64String): ExternalSourceAspectProps;
+    // @alpha
+    static deleteForElement(targetDb: IModelDb, targetScopeElementId: Id64String, targetElementId: Id64String): void;
     identifier: string;
     jsonProperties: {
         [key: string]: any;
@@ -1372,6 +1376,14 @@ export class ExternalSourceAspect extends ElementMultiAspect implements External
     version?: string;
 }
 
+// @public (undocumented)
+export namespace ExternalSourceAspect {
+    export enum Kind {
+        // (undocumented)
+        Element = "Element"
+    }
+}
+
 // @public
 export abstract class FunctionalBreakdownElement extends FunctionalElement {
     // @internal
@@ -1880,28 +1892,29 @@ export class IModelImporter {
     excludeSubject(subjectPath: string): void;
     findCodeSpecId(sourceId: Id64String): Id64String;
     findElementId(sourceId: Id64String): Id64String;
+    protected hasElementChanged(sourceElement: Element, targetScopeElementId: Id64String, targetElementId: Id64String): boolean;
     // (undocumented)
     import(): void;
-    importChildElements(sourceElementId: Id64String): void;
+    importChildElements(sourceElementId: Id64String, targetScopeElementId: Id64String): void;
     // (undocumented)
     importCodeSpec(sourceId: Id64String): Id64String;
     // (undocumented)
     importCodeSpecs(): void;
-    // (undocumented)
-    importElement(sourceElementId: Id64String): void;
+    importElement(sourceElementId: Id64String, targetScopeElementId: Id64String): void;
     // (undocumented)
     importFonts(): void;
     importModel(sourceModeledElementId: Id64String): void;
-    importModelContents(sourceModeledElementId: Id64String): void;
-    // (undocumented)
-    importModels(modeledElementClass: string): void;
+    importModelContents(sourceModeledElementId: Id64String, targetScopeElementId: Id64String): void;
+    importModels(modeledElementClass: string, targetScopeElementId: Id64String): void;
     // (undocumented)
     importRelationships(): void;
     // (undocumented)
     initFromExternalSourceAspects(): void;
     // (undocumented)
     static resolveSubjectId(iModelDb: IModelDb, subjectPath: string): Id64String | undefined;
-    protected transformAndInsertElement(sourceElement: Element): void;
+    protected transformAndInsertElement(sourceElement: Element, targetScopeElementId: Id64String): void;
+    transformAndUpdateElement(sourceElement: Element, targetScopeElementId: Id64String, targetElementId: Id64String): void;
+    protected transformElement(sourceElement: Element): ElementProps;
 }
 
 // @public

diff --git a/common/api/summary/geometry-core.exports.csv b/common/api/summary/geometry-core.exports.csv
@@ -63,6 +63,8 @@ public;CurveChainWithDistanceIndex
 public;class CurveCollection 
 public;CurveCurve
 public;CurveCurveApproachType
+public;CurveExtendMode
+public;CurveExtendOptions
 public;CurveIntervalRole
 public;CurveLocationDetail
 public;CurveLocationDetailArrayPair
@@ -198,6 +200,7 @@ public;UVSelect
 public;UVSurface
 public;UVSurfaceIsoParametricDistance
 public;UVSurfaceOps
+public;VariantCurveExtendParameter = boolean | CurveExtendMode | CurveExtendMode[]
 public;Vector2d 
 public;Vector3d 
 public;Vector3dArray

diff --git a/common/api/summary/imodeljs-backend.exports.csv b/common/api/summary/imodeljs-backend.exports.csv
@@ -99,6 +99,7 @@ beta;ExportGraphicsInfo
 beta;ExportGraphicsMesh
 beta;ExportGraphicsProps
 public;ExternalSourceAspect 
+public;ExternalSourceAspect
 public;class FunctionalBreakdownElement 
 public;class FunctionalComponentElement 
 public;FunctionalComposite 

diff --git a/common/api/ui-framework.api.md b/common/api/ui-framework.api.md
@@ -2070,6 +2070,10 @@ export class ListPicker extends React_2.Component<ListPickerPropsExtended> {
 // @beta
 export class ListPickerBase extends React_2.PureComponent<ListPickerProps, ListPickerState> {
     constructor(props: any);
+    // @internal (undocumented)
+    componentDidMount(): void;
+    // @internal (undocumented)
+    componentWillUnmount(): void;
     getExpandedContent(): React_2.ReactNode;
     isExpanded: () => boolean;
     minimize: () => void;
@@ -2156,6 +2160,7 @@ export interface MessageCenterFieldProps extends StatusFieldProps {
 // @public
 export class MessageManager {
     static addMessage(message: NotifyMessageDetails): void;
+    static addToMessageCenter(message: NotifyMessageDetails): void;
     static clearMessages(): void;
     static displayInputFieldMessage(target: HTMLElement, messageText: HTMLElement | string, detailedMessage?: HTMLElement | string, priority?: OutputMessagePriority): void;
     static endActivityMessage(isCompleted: boolean): boolean;
@@ -3208,7 +3213,7 @@ export class ToolInformation {
 
 // @public
 export class ToolItemDef extends ActionButtonItemDef {
-    constructor(commandItemProps: ToolItemProps);
+    constructor(toolItemProps: ToolItemProps);
     // (undocumented)
     readonly id: string;
     // (undocumented)
@@ -3368,6 +3373,7 @@ export class UiFramework {
     static initializeEx(store: Store<any>, i18n: I18N, oidcConfig?: OidcFrontendClientConfiguration, frameworkStateKey?: string, projectServices?: ProjectServices, iModelServices?: IModelServices): Promise<any>;
     // @internal (undocumented)
     static loggerCategory(obj: any): string;
+    // @beta (undocumented)
     static readonly oidcClient: IOidcFrontendClient;
     // @beta
     static readonly onUiVisibilityChanged: UiVisibilityChangedEvent;

diff --git a/common/changes/@bentley/geometry-core/EDLDistanceIndex_2019-06-11-18-09.json b/common/changes/@bentley/geometry-core/EDLDistanceIndex_2019-06-11-18-09.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Add \"extend\" support to various CurvePrimitive.closestPoint methods.",
+      "packageName": "@bentley/geometry-core",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/geometry-core",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@bentley/imodeljs-backend/catch_tile_upload_errors_2019-06-11-14-41.json b/common/changes/@bentley/imodeljs-backend/catch_tile_upload_errors_2019-06-11-14-41.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Catch tile upload errors.",
+      "packageName": "@bentley/imodeljs-backend",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/imodeljs-backend",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@bentley/imodeljs-backend/cleanperftests_2019-06-11-05-28.json b/common/changes/@bentley/imodeljs-backend/cleanperftests_2019-06-11-05-28.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@bentley/imodeljs-backend",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/imodeljs-backend",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@bentley/imodeljs-backend/more-IModelImporter_2019-06-10-21-55.json b/common/changes/@bentley/imodeljs-backend/more-IModelImporter_2019-06-10-21-55.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@bentley/imodeljs-backend",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/imodeljs-backend",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@bentley/imodeljs-backend/snapshot-doc_2019-06-11-11-50.json b/common/changes/@bentley/imodeljs-backend/snapshot-doc_2019-06-11-11-50.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@bentley/imodeljs-backend",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/imodeljs-backend",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@bentley/imodeljs-common/catch_tile_upload_errors_2019-06-11-15-16.json b/common/changes/@bentley/imodeljs-common/catch_tile_upload_errors_2019-06-11-15-16.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Minor error fixed.",
+      "packageName": "@bentley/imodeljs-common",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/imodeljs-common",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@bentley/imodeljs-frontend/snapshot-doc_2019-06-11-11-50.json b/common/changes/@bentley/imodeljs-frontend/snapshot-doc_2019-06-11-11-50.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@bentley/imodeljs-frontend",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/imodeljs-frontend",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@bentley/ui-framework/ui-framework-tests_2019-06-10-20-12.json b/common/changes/@bentley/ui-framework/ui-framework-tests_2019-06-10-20-12.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Added MessageManager.addToMessageCenter. ui-framework unit tests.",
+      "packageName": "@bentley/ui-framework",
+      "type": "none"
+    }
+  ],
+  "packageName": "@bentley/ui-framework",
+  "email": "[email protected]"
+}
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -2,7 +2,7 @@
   {
     "policyName": "prerelease-monorepo-lockStep",
     "definitionName": "lockStepVersion",
-    "version": "1.1.0-dev.7",
+    "version": "1.1.0-dev.8",
     "nextBump": "prerelease"
   }
 ]
diff --git a/core/backend/package.json b/core/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bentley/imodeljs-backend",
-  "version": "1.1.0-dev.7",
+  "version": "1.1.0-dev.8",
   "description": "iModel.js backend components",
   "main": "lib/imodeljs-backend.js",
   "typings": "lib/imodeljs-backend",
@@ -41,25 +41,25 @@
     "url": "http://www.bentley.com"
   },
   "peerDependencies": {
-    "@bentley/bentleyjs-core": "^1.1.0-dev.7",
-    "@bentley/geometry-core": "^1.1.0-dev.7",
-    "@bentley/imodeljs-clients": "^1.1.0-dev.7",
-    "@bentley/imodeljs-clients-backend": "^1.1.0-dev.7",
-    "@bentley/imodeljs-common": "^1.1.0-dev.7"
+    "@bentley/bentleyjs-core": "^1.1.0-dev.8",
+    "@bentley/geometry-core": "^1.1.0-dev.8",
+    "@bentley/imodeljs-clients": "^1.1.0-dev.8",
+    "@bentley/imodeljs-clients-backend": "^1.1.0-dev.8",
+    "@bentley/imodeljs-common": "^1.1.0-dev.8"
   },
   "//devDependencies": [
     "NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install",
     "NOTE: All tools used by scripts in this package must be listed as devDependencies"
   ],
   "devDependencies": {
-    "@bentley/config-loader": "1.1.0-dev.7",
-    "@bentley/bentleyjs-core": "1.1.0-dev.7",
-    "@bentley/build-tools": "1.1.0-dev.7",
-    "@bentley/geometry-core": "1.1.0-dev.7",
-    "@bentley/imodeljs-clients": "1.1.0-dev.7",
-    "@bentley/imodeljs-clients-backend": "1.1.0-dev.7",
-    "@bentley/imodeljs-common": "1.1.0-dev.7",
-    "@bentley/perf-tools": "1.1.0-dev.7",
+    "@bentley/config-loader": "1.1.0-dev.8",
+    "@bentley/bentleyjs-core": "1.1.0-dev.8",
+    "@bentley/build-tools": "1.1.0-dev.8",
+    "@bentley/geometry-core": "1.1.0-dev.8",
+    "@bentley/imodeljs-clients": "1.1.0-dev.8",
+    "@bentley/imodeljs-clients-backend": "1.1.0-dev.8",
+    "@bentley/imodeljs-common": "1.1.0-dev.8",
+    "@bentley/perf-tools": "1.1.0-dev.8",
     "@types/chai": "^4.1.4",
     "@types/formidable": "^1.0.31",
     "@types/fs-extra": "^4.0.7",