@mlightcad/cad-simple-viewer 1.5.0 → 1.5.1

package/lib/command/convert/AcApHtmlSnapshotBuilder.js

@@ -0,0 +1,301 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { ACEX_SNAPSHOT_VERSION, buildOsnapCatalog, buildViewerMetadata, collectBatchesFromObject3D } from '@mlightcad/cad-html-exporter';
+import { AcApI18n } from '../../i18n';
+import { yieldToMain } from '../../util';
+/**
+ * Serializes the live Three.js scene into a versioned {@link AcExSnapshotV1}.
+ *
+ * The snapshot contains layer visibility, per-layout line/mesh batches, and
+ * viewer metadata (extents, units, background). It is display-only: no DXF/DWG
+ * entities or edit capability are preserved.
+ */
+var AcApHtmlSnapshotBuilder = /** @class */ (function () {
+    function AcApHtmlSnapshotBuilder() {
+    }
+    /**
+     * Builds a snapshot synchronously in one pass.
+     *
+     * Prefer {@link buildAsync} for interactive export so the UI can stay responsive.
+     *
+     * @param scene - Current renderer scene (layouts, layers, active layout).
+     * @param database - Open drawing database used for layout names and metadata.
+     * @param options - Optional title, background, and locale overrides.
+     * @returns A complete v1 snapshot ready for `packHtml`.
+     */
+    AcApHtmlSnapshotBuilder.prototype.build = function (scene, database, options) {
+        if (options === void 0) { options = {}; }
+        return this.buildSync(scene, database, options);
+    };
+    /**
+     * Builds a snapshot incrementally, yielding to the main thread between layouts.
+     *
+     * Geometry is collected per layout layer so a busy indicator can repaint
+     * during large drawings.
+     *
+     * @param scene - Current renderer scene (layouts, layers, active layout).
+     * @param database - Open drawing database used for layout names and metadata.
+     * @param options - Optional title, background, and locale overrides.
+     * @returns A complete v1 snapshot ready for `packHtml`.
+     */
+    AcApHtmlSnapshotBuilder.prototype.buildAsync = function (scene_1, database_1) {
+        return __awaiter(this, arguments, void 0, function (scene, database, options) {
+            var meta, layers, layouts, _a, _b, _c, btrId, layout, lineBatches, meshBatches, _d, _e, _f, layer, collected, e_1_1, e_2_1;
+            var e_2, _g, e_1, _h;
+            if (options === void 0) { options = {}; }
+            return __generator(this, function (_j) {
+                switch (_j.label) {
+                    case 0: return [4 /*yield*/, yieldToMain()];
+                    case 1:
+                        _j.sent();
+                        meta = buildViewerMetadata(database, {
+                            title: options.title,
+                            background: options.background
+                        });
+                        layers = [];
+                        scene.layers.forEach(function (layer) {
+                            var _a;
+                            layers.push({
+                                name: layer.name,
+                                color: (_a = layer.color.RGB) !== null && _a !== void 0 ? _a : 0xffffff,
+                                visible: !layer.isOff && !layer.isFrozen
+                            });
+                        });
+                        layouts = [];
+                        _j.label = 2;
+                    case 2:
+                        _j.trys.push([2, 15, 16, 17]);
+                        _a = __values(scene.layouts), _b = _a.next();
+                        _j.label = 3;
+                    case 3:
+                        if (!!_b.done) return [3 /*break*/, 14];
+                        _c = __read(_b.value, 2), btrId = _c[0], layout = _c[1];
+                        lineBatches = [];
+                        meshBatches = [];
+                        _j.label = 4;
+                    case 4:
+                        _j.trys.push([4, 9, 10, 11]);
+                        _d = (e_1 = void 0, __values(layout.layers)), _e = _d.next();
+                        _j.label = 5;
+                    case 5:
+                        if (!!_e.done) return [3 /*break*/, 8];
+                        _f = __read(_e.value, 2), layer = _f[1];
+                        collected = collectBatchesFromObject3D(layer.internalObject);
+                        lineBatches.push.apply(lineBatches, __spreadArray([], __read(collected.lineBatches), false));
+                        meshBatches.push.apply(meshBatches, __spreadArray([], __read(collected.meshBatches), false));
+                        return [4 /*yield*/, yieldToMain()];
+                    case 6:
+                        _j.sent();
+                        _j.label = 7;
+                    case 7:
+                        _e = _d.next();
+                        return [3 /*break*/, 5];
+                    case 8: return [3 /*break*/, 11];
+                    case 9:
+                        e_1_1 = _j.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 11];
+                    case 10:
+                        try {
+                            if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 11:
+                        layouts.push({
+                            btrId: btrId,
+                            name: resolveLayoutName(database, btrId),
+                            isModelSpace: btrId === scene.modelSpaceBtrId,
+                            lineBatches: lineBatches,
+                            meshBatches: meshBatches,
+                            osnap: buildOsnapCatalog(database, btrId)
+                        });
+                        return [4 /*yield*/, yieldToMain()];
+                    case 12:
+                        _j.sent();
+                        _j.label = 13;
+                    case 13:
+                        _b = _a.next();
+                        return [3 /*break*/, 3];
+                    case 14: return [3 /*break*/, 17];
+                    case 15:
+                        e_2_1 = _j.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 17];
+                    case 16:
+                        try {
+                            if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 17: return [2 /*return*/, {
+                            version: ACEX_SNAPSHOT_VERSION,
+                            meta: buildSnapshotMeta(meta, options),
+                            layers: layers,
+                            layouts: layouts,
+                            activeLayoutBtrId: scene.activeLayoutBtrId || scene.modelSpaceBtrId
+                        }];
+                }
+            });
+        });
+    };
+    /**
+     * Synchronous implementation shared by {@link build} and {@link buildAsync}.
+     *
+     * @param scene - Current renderer scene.
+     * @param database - Open drawing database.
+     * @param options - Snapshot overrides.
+     * @returns A complete v1 snapshot.
+     */
+    AcApHtmlSnapshotBuilder.prototype.buildSync = function (scene, database, options) {
+        var meta = buildViewerMetadata(database, {
+            title: options.title,
+            background: options.background
+        });
+        var layers = [];
+        scene.layers.forEach(function (layer) {
+            var _a;
+            layers.push({
+                name: layer.name,
+                color: (_a = layer.color.RGB) !== null && _a !== void 0 ? _a : 0xffffff,
+                visible: !layer.isOff && !layer.isFrozen
+            });
+        });
+        var layouts = [];
+        scene.layouts.forEach(function (layout, btrId) {
+            var _a = collectBatchesFromObject3D(layout.internalObject), lineBatches = _a.lineBatches, meshBatches = _a.meshBatches;
+            layouts.push({
+                btrId: btrId,
+                name: resolveLayoutName(database, btrId),
+                isModelSpace: btrId === scene.modelSpaceBtrId,
+                lineBatches: lineBatches,
+                meshBatches: meshBatches,
+                osnap: buildOsnapCatalog(database, btrId)
+            });
+        });
+        return {
+            version: ACEX_SNAPSHOT_VERSION,
+            meta: buildSnapshotMeta(meta, options),
+            layers: layers,
+            layouts: layouts,
+            activeLayoutBtrId: scene.activeLayoutBtrId || scene.modelSpaceBtrId
+        };
+    };
+    return AcApHtmlSnapshotBuilder;
+}());
+export { AcApHtmlSnapshotBuilder };
+/**
+ * Merges database-derived viewer metadata with export-time options.
+ *
+ * @param meta - Extents, units, and background from {@link buildViewerMetadata}.
+ * @param options - User overrides (title is taken from `meta`; locale from options).
+ * @returns The `meta` block stored on {@link AcExSnapshotV1}.
+ */
+function buildSnapshotMeta(meta, options) {
+    var _a;
+    return {
+        title: meta.title,
+        createdAt: new Date().toISOString(),
+        extents: meta.extents,
+        units: meta.units,
+        background: meta.background,
+        locale: (_a = options.locale) !== null && _a !== void 0 ? _a : AcApI18n.currentLocale
+    };
+}
+/**
+ * Resolves a block table record object id to its layout/block name.
+ *
+ * @param database - Drawing whose block table is searched.
+ * @param btrId - Object id of the layout's owning block table record.
+ * @returns The record name, or `btrId` if no matching block is found.
+ */
+function resolveLayoutName(database, btrId) {
+    var e_3, _a;
+    try {
+        for (var _b = __values(database.tables.blockTable.newIterator()), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var block = _c.value;
+            if (block.objectId === btrId) {
+                return block.name;
+            }
+        }
+    }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_3) throw e_3.error; }
+    }
+    return btrId;
+}
+//# sourceMappingURL=AcApHtmlSnapshotBuilder.js.map

package/lib/command/convert/AcApHtmlSnapshotBuilder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApHtmlSnapshotBuilder.js","sourceRoot":"","sources":["../../../src/command/convert/AcApHtmlSnapshotBuilder.ts"],"names":[],"mappings":"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"}

package/lib/command/convert/index.d.ts

@@ -2,5 +2,8 @@ export * from './AcApConvertToDxfCmd';
 export * from './AcApConvertToPngCmd';
 export * from './AcApPngConvertor';
 export * from './AcApConvertToSvgCmd';
+export * from './AcApExportHtmlCmd';
+export * from './AcApHtmlConvertor';
+export * from './AcApHtmlSnapshotBuilder';
 export * from './AcApDxfConvertor';
 //# sourceMappingURL=index.d.ts.map

package/lib/command/convert/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA"}

package/lib/command/convert/index.js

@@ -2,5 +2,8 @@ export * from './AcApConvertToDxfCmd';
 export * from './AcApConvertToPngCmd';
 export * from './AcApPngConvertor';
 export * from './AcApConvertToSvgCmd';
+export * from './AcApExportHtmlCmd';
+export * from './AcApHtmlConvertor';
+export * from './AcApHtmlSnapshotBuilder';
 export * from './AcApDxfConvertor';
 //# sourceMappingURL=index.js.map

package/lib/command/convert/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/convert/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,2BAA2B,CAAA;AACzC,cAAc,oBAAoB,CAAA"}

package/lib/command/draw/AcApArcCmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApArcCmd.d.ts","sourceRoot":"","sources":["../../../src/command/draw/AcApArcCmd.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAkB,MAAM,WAAW,CAAA;AACvD,OAAO,EAEL,WAAW,EASZ,MAAM,cAAc,CAAA;AAquBrB;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACzC;;OAEG;;IAMH;;;;;;OAMG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;IA6BlC;;;;;;;;;;;OAWG;YACW,gBAAgB;IA+C9B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAclB;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAMjB;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;;;;;;;OAQG;YACW,gBAAgB;IAM9B;;;;;;;;OAQG;YACW,iBAAiB;IAW/B;;;;;;;;OAQG;YACW,cAAc;IAW5B;;;;;;;;;OASG;YACW,iBAAiB;IAS/B;;;;;;;;OAQG;YACW,sBAAsB;IAUpC;;;;;;;;OAQG;YACW,2BAA2B;IAMzC;;;;;;;;;;OAUG;YACW,uBAAuB;IA4FrC;;;;;;;;;;OAUG;YACW,uBAAuB;IA4FrC;;;;;;;;;;OAUG;YACW,oBAAoB;IA+HlC;;;;;;;;OAQG;YACW,wBAAwB;IAMtC;;;;;;;;OAQG;YACW,0BAA0B;IASxC;;;;;;;;;;OAUG;YACW,yBAAyB;IAqCvC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAK7B;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAI9B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAK/B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAM9B;;;;;;;;;;OAUG;YACW,YAAY;IA6B1B;;;;;;OAMG;YACW,mBAAmB;IAuCjC;;;;;OAKG;YACW,kBAAkB;IAsBhC;;;;;;OAMG;YACW,kBAAkB;IAiBhC;;;;;;;;;;;OAWG;YACW,qBAAqB;IA0FnC;;;;;;;;;;;OAWG;YACW,eAAe;IAyH7B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;CAGjB"}
+{"version":3,"file":"AcApArcCmd.d.ts","sourceRoot":"","sources":["../../../src/command/draw/AcApArcCmd.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAkB,MAAM,WAAW,CAAA;AACvD,OAAO,EAEL,WAAW,EASZ,MAAM,cAAc,CAAA;AAkwBrB;;;;;;;;GAQG;AACH,qBAAa,UAAW,SAAQ,WAAW;IACzC;;OAEG;;IAMH;;;;;;OAMG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;IA6BlC;;;;;;;;;;;OAWG;YACW,gBAAgB;IA+C9B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,gBAAgB;IAgBxB;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAclB;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAMjB;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;;;;;;;OAQG;YACW,gBAAgB;IAM9B;;;;;;;;OAQG;YACW,iBAAiB;IAW/B;;;;;;;;OAQG;YACW,cAAc;IAW5B;;;;;;;;;OASG;YACW,iBAAiB;IAS/B;;;;;;;;OAQG;YACW,sBAAsB;IAUpC;;;;;;;;OAQG;YACW,2BAA2B;IAMzC;;;;;;;;;;OAUG;YACW,uBAAuB;IA4FrC;;;;;;;;;;OAUG;YACW,uBAAuB;IA4FrC;;;;;;;;;;OAUG;YACW,oBAAoB;IA+HlC;;;;;;;;OAQG;YACW,wBAAwB;IAMtC;;;;;;;;OAQG;YACW,0BAA0B;IASxC;;;;;;;;;;OAUG;YACW,yBAAyB;IAqCvC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAK7B;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAI9B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAK/B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAM9B;;;;;;;;;;OAUG;YACW,YAAY;IA6B1B;;;;;;OAMG;YACW,mBAAmB;IAuCjC;;;;;OAKG;YACW,kBAAkB;IAsBhC;;;;;;OAMG;YACW,kBAAkB;IAiBhC;;;;;;;;;;;OAWG;YACW,qBAAqB;IA6FnC;;;;;;;;;;;OAWG;YACW,eAAe;IA4H7B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;CAGjB"}

package/lib/command/draw/AcApArcCmd.js

@@ -49,12 +49,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { AcDbArc, AcGePoint3d } from '@mlightcad/data-model';
+import { AcDbArc, AcGePoint3d, AcGeTol, FLOAT_TOL, TAU } from '@mlightcad/data-model';
 import { AcApDocManager } from '../../app';
 import { AcEdCommand, AcEdOpenMode, AcEdPreviewJig, AcEdPromptAngleOptions, AcEdPromptDistanceOptions, AcEdPromptDoubleOptions, AcEdPromptPointOptions, AcEdPromptStatus, eventBus } from '../../editor';
 import { AcApI18n } from '../../i18n';
-var TAU = Math.PI * 2;
-var EPSILON = 1e-9;
 var POSITIVE_NORMAL = { x: 0, y: 0, z: 1 };
 var NEGATIVE_NORMAL = { x: 0, y: 0, z: -1 };
 /**
@@ -90,7 +88,7 @@ function directionAngleDeg(from, to) {
 /**
  * Computes point angle around a center under a given arc orientation.
  *
- * For `normalSign = -1` (clockwise), the Y component is mirrored so that
+ * For `normalSign = -1` (clockwise), the X component is mirrored so that
  * angle growth still follows the selected arc direction convention.
  *
  * @param center - Arc center.
@@ -99,10 +97,11 @@ function directionAngleDeg(from, to) {
  * @returns Direction-aware normalized angle in radians.
  */
 function angleByNormalSign(center, point, normalSign) {
-    // For -Z arcs, mirror Y so the angle still increases in the arc direction.
+    // AcDbArc stores start/end in OCS. For a -Z extrusion, data-model chooses
+    // OCS X = -WCS X and OCS Y = WCS Y, so mirror X rather than Y.
     var dx = point.x - center.x;
     var dy = point.y - center.y;
-    var raw = normalSign === 1 ? Math.atan2(dy, dx) : Math.atan2(-dy, dx);
+    var raw = normalSign === 1 ? Math.atan2(dy, dx) : Math.atan2(dy, -dx);
     return normalizeAngle(raw);
 }
 /**
@@ -114,6 +113,9 @@ function angleByNormalSign(center, point, normalSign) {
 function toNormal(sign) {
     return sign === 1 ? POSITIVE_NORMAL : NEGATIVE_NORMAL;
 }
+function normalSignOf(entity) {
+    return entity.normal.z >= 0 ? 1 : -1;
+}
 /**
  * Creates one `AcDbArc` entity from normalized arc definition data.
  *
@@ -166,7 +168,7 @@ function projectPointToCircle(center, radius, point) {
     var dx = point.x - center.x;
     var dy = point.y - center.y;
     var distance = Math.hypot(dx, dy);
-    if (distance <= EPSILON)
+    if (AcGeTol.isNonPositive(distance))
         return undefined;
     var scale = radius / distance;
     return {
@@ -240,7 +242,7 @@ function createArcFromThreePoints(start, second, end, reverseDirection) {
     var x3 = end.x;
     var y3 = end.y;
     var d = 2 * (x1 * (y2 - y3) + x2 * (y3 - y1) + x3 * (y1 - y2));
-    if (Math.abs(d) <= EPSILON)
+    if (AcGeTol.equalToZero(d))
         return undefined;
     var ux = ((x1 * x1 + y1 * y1) * (y2 - y3) +
         (x2 * x2 + y2 * y2) * (y3 - y1) +
@@ -252,7 +254,7 @@ function createArcFromThreePoints(start, second, end, reverseDirection) {
         d;
     var center = { x: ux, y: uy, z: 0 };
     var radius = distance2d(center, start);
-    if (!Number.isFinite(radius) || radius <= EPSILON)
+    if (!Number.isFinite(radius) || AcGeTol.isNonPositive(radius))
         return undefined;
     // By default, choose the arc that actually passes through the second point.
     // Ctrl toggle can reverse this selection to the complementary direction.
@@ -280,11 +282,11 @@ function createArcFromThreePoints(start, second, end, reverseDirection) {
 function createArcFromCenterStartEnd(center, start, end, normalSign) {
     var radiusFromStart = distance2d(center, start);
     var radiusFromEnd = distance2d(center, end);
-    if (radiusFromStart <= EPSILON || radiusFromEnd <= EPSILON) {
+    if (AcGeTol.isNonPositive(radiusFromStart) || AcGeTol.isNonPositive(radiusFromEnd)) {
         return undefined;
     }
     // Start/end must lie on the same circle (small tolerance for picked input).
-    var tolerance = Math.max(EPSILON, radiusFromStart * 1e-6);
+    var tolerance = Math.max(FLOAT_TOL, radiusFromStart * FLOAT_TOL);
     if (Math.abs(radiusFromStart - radiusFromEnd) > tolerance) {
         return undefined;
     }
@@ -310,7 +312,7 @@ function createArcFromCenterStartEnd(center, start, end, normalSign) {
  */
 function createArcFromCenterStartProjectedEnd(center, start, rawEnd, normalSign) {
     var radius = distance2d(center, start);
-    if (radius <= EPSILON)
+    if (AcGeTol.isNonPositive(radius))
         return undefined;
     var end = projectPointToCircle(center, radius, rawEnd);
     if (!end)
@@ -330,7 +332,9 @@ function createArcFromCenterStartProjectedEnd(center, start, rawEnd, normalSign)
 function createArcFromCenterStartSweep(center, start, sweepRad) {
     var radius = distance2d(center, start);
     var sweep = Math.abs(sweepRad);
-    if (radius <= EPSILON || sweep <= EPSILON || sweep >= TAU - EPSILON) {
+    if (AcGeTol.isNonPositive(radius) ||
+        AcGeTol.isNonPositive(sweep) ||
+        !AcGeTol.great(TAU - sweep, 0)) {
         return undefined;
     }
     var normalSign = sweepRad >= 0 ? 1 : -1;
@@ -357,7 +361,9 @@ function createArcFromCenterStartSweep(center, start, sweepRad) {
 function createArcFromCenterStartChord(center, start, chordLength) {
     var radius = distance2d(center, start);
     var chord = Math.abs(chordLength);
-    if (radius <= EPSILON || chord <= EPSILON || chord > 2 * radius + EPSILON) {
+    if (AcGeTol.isNonPositive(radius) ||
+        AcGeTol.isNonPositive(chord) ||
+        AcGeTol.great(chord, 2 * radius)) {
         return undefined;
     }
     var ratio = Math.max(-1, Math.min(1, chord / (2 * radius)));
@@ -376,16 +382,18 @@ function createArcFromCenterStartChord(center, start, chordLength) {
 function createArcFromStartEndAngle(start, end, sweepRad) {
     var chord = distance2d(start, end);
     var sweep = Math.abs(sweepRad);
-    if (chord <= EPSILON || sweep <= EPSILON || sweep >= TAU - EPSILON) {
+    if (AcGeTol.isNonPositive(chord) ||
+        AcGeTol.isNonPositive(sweep) ||
+        !AcGeTol.great(TAU - sweep, 0)) {
         return undefined;
     }
     // chord = 2 * r * sin(theta/2)  ->  r = chord / (2 * sin(theta/2))
     var sinHalf = Math.sin(sweep / 2);
-    if (Math.abs(sinHalf) <= EPSILON)
+    if (AcGeTol.equalToZero(sinHalf))
         return undefined;
     var radius = chord / (2 * sinHalf);
     var offsetSquared = radius * radius - (chord * chord) / 4;
-    if (offsetSquared < -EPSILON)
+    if (AcGeTol.less(offsetSquared, 0))
         return undefined;
     var offset = Math.sqrt(Math.max(0, offsetSquared));
     var midX = (start.x + end.x) / 2;
@@ -426,7 +434,7 @@ function createArcFromStartEndDirection(start, end, directionRad) {
     var nx = -ty;
     var ny = tx;
     var denominator = 2 * (dx * nx + dy * ny);
-    if (Math.abs(denominator) <= EPSILON)
+    if (AcGeTol.equalToZero(denominator))
         return undefined;
     // Solve center = start + lambda * n so that |center-start| = |center-end|.
     var lambda = (dx * dx + dy * dy) / denominator;
@@ -440,7 +448,7 @@ function createArcFromStartEndDirection(start, end, directionRad) {
     var radiusVectorX = start.x - center.x;
     var radiusVectorY = start.y - center.y;
     var cross = radiusVectorX * ty - radiusVectorY * tx;
-    if (Math.abs(cross) <= EPSILON)
+    if (AcGeTol.equalToZero(cross))
         return undefined;
     var normalSign = cross >= 0 ? 1 : -1;
     return createArcFromCenterStartEnd(center, start, end, normalSign);
@@ -458,7 +466,9 @@ function createArcFromStartEndDirection(start, end, directionRad) {
 function createArcFromStartEndRadius(start, end, radiusInput) {
     var radius = Math.abs(radiusInput);
     var chord = distance2d(start, end);
-    if (radius <= EPSILON || chord <= EPSILON || chord > 2 * radius + EPSILON) {
+    if (AcGeTol.isNonPositive(radius) ||
+        AcGeTol.isNonPositive(chord) ||
+        AcGeTol.great(chord, 2 * radius)) {
         return undefined;
     }
     var midX = (start.x + end.x) / 2;
@@ -520,6 +530,11 @@ var AcApArcJig = /** @class */ (function (_super) {
         var definition = this._builder(point);
         if (!definition)
             return;
+        if (definition.normalSign !== normalSignOf(this._arc)) {
+            this.end();
+            this._arc = createArcEntity(definition);
+            return;
+        }
         applyArcDefinition(this._arc, definition);
     };
     return AcApArcJig;
@@ -567,6 +582,11 @@ var AcApArcValueJig = /** @class */ (function (_super) {
         var definition = this._builder(value);
         if (!definition)
             return;
+        if (definition.normalSign !== normalSignOf(this._arc)) {
+            this.end();
+            this._arc = createArcEntity(definition);
+            return;
+        }
         applyArcDefinition(this._arc, definition);
     };
     return AcApArcValueJig;
@@ -1642,6 +1662,9 @@ var AcApArcCmd = /** @class */ (function (_super) {
                         chordPrompt = new AcEdPromptDistanceOptions(AcApI18n.t('jig.arc.chordLength'));
                         chordPrompt.allowZero = false;
                         chordPrompt.allowNegative = true;
+                        chordPrompt.useBasePoint = true;
+                        chordPrompt.useDashedLine = true;
+                        chordPrompt.basePoint = new AcGePoint3d(start);
                         return [4 /*yield*/, AcApDocManager.instance.editor.getDistance(chordPrompt)];
                     case 4:
                         chordResult = _a.sent();
@@ -1757,6 +1780,9 @@ var AcApArcCmd = /** @class */ (function (_super) {
                         radiusPrompt = new AcEdPromptDistanceOptions(AcApI18n.t('jig.arc.radius'));
                         radiusPrompt.allowZero = false;
                         radiusPrompt.allowNegative = true;
+                        radiusPrompt.useBasePoint = true;
+                        radiusPrompt.useDashedLine = true;
+                        radiusPrompt.basePoint = new AcGePoint3d(start);
                         return [4 /*yield*/, AcApDocManager.instance.editor.getDistance(radiusPrompt)];
                     case 7:
                         radiusResult = _a.sent();