@mlightcad/data-model 1.3.13 → 1.3.14

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 (6) hide show
  1. package/dist/data-model.cjs +1 -1
  2. package/dist/data-model.js +402 -401
  3. package/lib/converter/AcDbObjectConverter.d.ts.map +1 -1
  4. package/lib/converter/AcDbObjectConverter.js +17 -17
  5. package/lib/converter/AcDbObjectConverter.js.map +1 -1
  6. package/package.json +3 -3
package/lib/converter/AcDbObjectConverter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AcDbObjectConverter.d.ts","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAEL,iBAAiB,EACjB,eAAe,EAChB,MAAM,qBAAqB,CAAA;AAI5B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS;IAwCvD;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,KAAK,EAAE,iBAAiB;IAOxC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,kBAAkB;CAI3B"}
1
+ {"version":3,"file":"AcDbObjectConverter.d.ts","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAEL,iBAAiB,EACjB,eAAe,EAChB,MAAM,qBAAqB,CAAA;AAI5B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;;;;;;OAWG;IACH,aAAa,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,SAAS;IAyCvD;;;;;;;;;;;OAWG;IACH,eAAe,CAAC,KAAK,EAAE,iBAAiB;IAOxC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,kBAAkB;CAI3B"}
package/lib/converter/AcDbObjectConverter.js CHANGED
@@ -34,31 +34,31 @@ var AcDbObjectConverter = /** @class */ (function () {
34
34
  var dbObject = new AcDbLayout();
35
35
  dbObject.layoutName = layout.layoutName;
36
36
  dbObject.tabOrder = layout.tabOrder;
37
- if (layout.ownerObjectId) {
38
- dbObject.blockTableRecordId = layout.ownerObjectId;
37
+ if (layout.layoutName === 'Model') {
38
+ // Upper case model space name
39
+ var modelSpaceName_1 = AcDbBlockTableRecord.MODEL_SPACE_NAME;
40
+ (_a = model.tables.BLOCK_RECORD) === null || _a === void 0 ? void 0 : _a.entries.some(function (btr) {
41
+ if (btr.name.toUpperCase() === modelSpaceName_1) {
42
+ dbObject.blockTableRecordId = btr.handle;
43
+ return true;
44
+ }
45
+ return false;
46
+ });
39
47
  }
40
48
  else {
41
- (_a = model.tables.BLOCK_RECORD) === null || _a === void 0 ? void 0 : _a.entries.some(function (btr) {
49
+ // layout.paperSpaceTableId doesn't point to the block table record asscicated with
50
+ // this layout. So let's get the assocated block table record id from block table.
51
+ (_b = model.tables.BLOCK_RECORD) === null || _b === void 0 ? void 0 : _b.entries.some(function (btr) {
42
52
  if (btr.layoutObjects === layout.handle) {
43
53
  dbObject.blockTableRecordId = btr.handle;
44
54
  return true;
45
55
  }
46
56
  return false;
47
57
  });
48
- }
49
- // If the layout is not found in the block table due to some unknow reason,
50
- // let's set the model space block table record id.
51
- if (!dbObject.blockTableRecordId) {
52
- if (layout.layoutName === 'Model') {
53
- // Upper case model space name
54
- var modelSpaceName_1 = AcDbBlockTableRecord.MODEL_SPACE_NAME;
55
- (_b = model.tables.BLOCK_RECORD) === null || _b === void 0 ? void 0 : _b.entries.some(function (btr) {
56
- if (btr.name.toUpperCase() === modelSpaceName_1) {
57
- dbObject.blockTableRecordId = btr.handle;
58
- return true;
59
- }
60
- return false;
61
- });
58
+ // If blockTableRecordId value is still invalid, let's try to use
59
+ // layout.paperSpaceTableId finally
60
+ if (!dbObject.blockTableRecordId) {
61
+ dbObject.blockTableRecordId = layout.paperSpaceTableId;
62
62
  }
63
63
  }
64
64
  dbObject.limits.min.copy(layout.minLimit);
package/lib/converter/AcDbObjectConverter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"AcDbObjectConverter.js","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH;IAAA;IA0FA,CAAC;IAzFC;;;;;;;;;;;OAWG;IACH,2CAAa,GAAb,UAAc,MAAuB,EAAE,KAAgB;;QACrD,IAAM,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAA;QACjC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;QACvC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;QACnC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,QAAQ,CAAC,kBAAkB,GAAG,MAAM,CAAC,aAAa,CAAA;QACpD,CAAC;aAAM,CAAC;YACN,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG;gBACzC,IAAI,GAAG,CAAC,aAAa,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;oBACxC,QAAQ,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAA;oBACxC,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,2EAA2E;QAC3E,mDAAmD;QACnD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YACjC,IAAI,MAAM,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;gBAClC,8BAA8B;gBAC9B,IAAM,gBAAc,GAAG,oBAAoB,CAAC,gBAAgB,CAAA;gBAC5D,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG;oBACzC,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,gBAAc,EAAE,CAAC;wBAC9C,QAAQ,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAA;wBACxC,OAAO,IAAI,CAAA;oBACb,CAAC;oBACD,OAAO,KAAK,CAAA;gBACd,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QACzC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,6CAAe,GAAf,UAAgB,KAAwB;QACtC,IAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAA;QACzC,QAAQ,CAAC,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAA;QACxC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACxC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACK,gDAAkB,GAA1B,UAA2B,MAAuB,EAAE,QAAoB;QACtE,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAA;QACjC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAA;IACzC,CAAC;IACH,0BAAC;AAAD,CAAC,AA1FD,IA0FC"}
1
+ {"version":3,"file":"AcDbObjectConverter.js","sourceRoot":"","sources":["../../src/converter/AcDbObjectConverter.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE1D;;;;;;;;;;;;;GAaG;AACH;IAAA;IA2FA,CAAC;IA1FC;;;;;;;;;;;OAWG;IACH,2CAAa,GAAb,UAAc,MAAuB,EAAE,KAAgB;;QACrD,IAAM,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAA;QACjC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;QACvC,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;QAEnC,IAAI,MAAM,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YAClC,8BAA8B;YAC9B,IAAM,gBAAc,GAAG,oBAAoB,CAAC,gBAAgB,CAAA;YAC5D,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG;gBACzC,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,gBAAc,EAAE,CAAC;oBAC9C,QAAQ,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAA;oBACxC,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,mFAAmF;YACnF,kFAAkF;YAClF,MAAA,KAAK,CAAC,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAC,IAAI,CAAC,UAAA,GAAG;gBACzC,IAAI,GAAG,CAAC,aAAa,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;oBACxC,QAAQ,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAA;oBACxC,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,CAAC,CAAA;YAEF,iEAAiE;YACjE,mCAAmC;YACnC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;gBACjC,QAAQ,CAAC,kBAAkB,GAAG,MAAM,CAAC,iBAAiB,CAAA;YACxD,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACzC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAC3C,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QACzC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,6CAAe,GAAf,UAAgB,KAAwB;QACtC,IAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAA;QACzC,QAAQ,CAAC,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAA;QACxC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACxC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED;;;;;;;;;;;;;OAaG;IACK,gDAAkB,GAA1B,UAA2B,MAAuB,EAAE,QAAoB;QACtE,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAA;QACjC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,aAAa,CAAA;IACzC,CAAC;IACH,0BAAC;AAAD,CAAC,AA3FD,IA2FC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mlightcad/data-model",
3
- "version": "1.3.13",
3
+ "version": "1.3.14",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "repository": {
@@ -38,8 +38,8 @@
38
38
  },
39
39
  "devDependencies": {
40
40
  "@mlightcad/common": "1.2.5",
41
- "@mlightcad/geometry-engine": "3.0.6",
42
- "@mlightcad/graphic-interface": "3.0.8"
41
+ "@mlightcad/graphic-interface": "3.0.8",
42
+ "@mlightcad/geometry-engine": "3.0.6"
43
43
  },
44
44
  "scripts": {
45
45
  "analyze": "pnpm run analyze:lib && pnpm run analyze:worker",