@shapediver/viewer.data-engine.sdtf-engine 2.0.2 → 2.0.5
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.
- package/dist/SDTFEngine.d.ts.map +1 -1
- package/dist/SDTFEngine.js +16 -1
- package/dist/SDTFEngine.js.map +1 -1
- package/package.json +8 -8
- package/src/SDTFEngine.ts +14 -1
package/dist/SDTFEngine.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SDTFEngine.d.ts","sourceRoot":"","sources":["../src/SDTFEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;AAIzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AAIrF,qBACa,UAAU;IAGnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IAErE,OAAO,CAAC,WAAW,CAAsB;;IAYzC;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;IAkCtF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;YACW,kBAAkB;IA2EhC;;;;;OAKG;YACW,cAAc;
|
|
1
|
+
{"version":3,"file":"SDTFEngine.d.ts","sourceRoot":"","sources":["../src/SDTFEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAY,MAAM,qCAAqC,CAAA;AAIzE,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAA;AAIrF,qBACa,UAAU;IAGnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6C;IAErE,OAAO,CAAC,WAAW,CAAsB;;IAYzC;;;;;OAKG;IACU,WAAW,CAAC,OAAO,EAAE,+BAA+B,GAAG,OAAO,CAAC,SAAS,CAAC;IAkCtF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;YACW,kBAAkB;IA2EhC;;;;;OAKG;YACW,cAAc;IAmB5B;;;;;;OAMG;YACW,SAAS;IA2BvB;;;;;;OAMG;YACW,QAAQ;IAyBtB;;;;;;OAMG;YACW,QAAQ;CA4BzB"}
|
package/dist/SDTFEngine.js
CHANGED
|
@@ -177,6 +177,13 @@ let SDTFEngine = class SDTFEngine {
|
|
|
177
177
|
const typeHint = attributes.entries[key].typeHint === undefined ? 'undefined' : attributes.entries[key].typeHint.name;
|
|
178
178
|
data.attributes[key] = new viewer_shared_types_1.SDTFAttributeData(typeHint, yield attributes.entries[key].getContent());
|
|
179
179
|
}
|
|
180
|
+
else {
|
|
181
|
+
// async data
|
|
182
|
+
const typeHint = attributes.entries[key].typeHint === undefined ? 'undefined' : attributes.entries[key].typeHint.name;
|
|
183
|
+
data.attributes[key] = new viewer_shared_types_1.SDTFAttributeData(typeHint, () => __awaiter(this, void 0, void 0, function* () {
|
|
184
|
+
return yield attributes.entries[key].getContent();
|
|
185
|
+
}));
|
|
186
|
+
}
|
|
180
187
|
}
|
|
181
188
|
return data;
|
|
182
189
|
});
|
|
@@ -228,8 +235,16 @@ let SDTFEngine = class SDTFEngine {
|
|
|
228
235
|
attributes = yield this.loadAttributes(item.attributes);
|
|
229
236
|
// create the typehint
|
|
230
237
|
const typeHint = item.typeHint === undefined ? 'undefined' : item.typeHint.name;
|
|
238
|
+
let itemData;
|
|
231
239
|
// create the data and save it in the item node
|
|
232
|
-
|
|
240
|
+
if (sdk_sdtf_primitives_1.SdtfPrimitiveTypeGuard.isBooleanType(typeHint) || sdk_sdtf_primitives_1.SdtfPrimitiveTypeGuard.isColorType(typeHint) || sdk_sdtf_primitives_1.SdtfPrimitiveTypeGuard.isNumberType(typeHint) || sdk_sdtf_primitives_1.SdtfPrimitiveTypeGuard.isStringType(typeHint)) {
|
|
241
|
+
itemData = new viewer_shared_types_1.SDTFItemData(typeHint, yield item.getContent(), attributes === null || attributes === void 0 ? void 0 : attributes.attributes);
|
|
242
|
+
}
|
|
243
|
+
else {
|
|
244
|
+
itemData = new viewer_shared_types_1.SDTFItemData(typeHint, () => __awaiter(this, void 0, void 0, function* () {
|
|
245
|
+
return yield item.getContent();
|
|
246
|
+
}), attributes === null || attributes === void 0 ? void 0 : attributes.attributes);
|
|
247
|
+
}
|
|
233
248
|
itemDef.data.push(itemData);
|
|
234
249
|
return itemDef;
|
|
235
250
|
});
|
package/dist/SDTFEngine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SDTFEngine.js","sourceRoot":"","sources":["../src/SDTFEngine.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SDTFEngine.js","sourceRoot":"","sources":["../src/SDTFEngine.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shapediver/viewer.data-engine.sdtf-engine",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Michael Oppitz <michael@shapediver.com>",
|
|
@@ -39,16 +39,16 @@
|
|
|
39
39
|
"testEnvironment": "node"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.
|
|
42
|
+
"@shapediver/sdk.geometry-api-sdk-v2": "^1.0.25",
|
|
43
43
|
"@shapediver/sdk.sdtf-v1": "1.0.0",
|
|
44
|
-
"@shapediver/viewer.data-engine.shared-types": "2.0.
|
|
45
|
-
"@shapediver/viewer.shared.build-data": "2.0.
|
|
46
|
-
"@shapediver/viewer.shared.node-tree": "2.0.
|
|
47
|
-
"@shapediver/viewer.shared.services": "2.0.
|
|
48
|
-
"@shapediver/viewer.shared.types": "2.0.
|
|
44
|
+
"@shapediver/viewer.data-engine.shared-types": "2.0.5",
|
|
45
|
+
"@shapediver/viewer.shared.build-data": "2.0.5",
|
|
46
|
+
"@shapediver/viewer.shared.node-tree": "2.0.5",
|
|
47
|
+
"@shapediver/viewer.shared.services": "2.0.5",
|
|
48
|
+
"@shapediver/viewer.shared.types": "2.0.5",
|
|
49
49
|
"axios": "^0.21.1",
|
|
50
50
|
"gl-matrix": "3.3.0",
|
|
51
51
|
"tsyringe": "^4.5.0"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "35de65c2189ae1c5b797e0a0d255ef2db32d2fb1"
|
|
54
54
|
}
|
package/src/SDTFEngine.ts
CHANGED
|
@@ -183,6 +183,12 @@ export class SDTFEngine {
|
|
|
183
183
|
// create the data item and save it in the dictionary
|
|
184
184
|
const typeHint = attributes.entries[key].typeHint === undefined ? 'undefined' : attributes.entries[key].typeHint!.name;
|
|
185
185
|
data.attributes[key] = new SDTFAttributeData(typeHint, await attributes.entries[key].getContent());
|
|
186
|
+
} else {
|
|
187
|
+
// async data
|
|
188
|
+
const typeHint = attributes.entries[key].typeHint === undefined ? 'undefined' : attributes.entries[key].typeHint!.name;
|
|
189
|
+
data.attributes[key] = new SDTFAttributeData(typeHint, async () => {
|
|
190
|
+
return await attributes.entries[key].getContent();
|
|
191
|
+
});
|
|
186
192
|
}
|
|
187
193
|
}
|
|
188
194
|
return data;
|
|
@@ -240,8 +246,15 @@ export class SDTFEngine {
|
|
|
240
246
|
// create the typehint
|
|
241
247
|
const typeHint = item.typeHint === undefined ? 'undefined' : item.typeHint!.name;
|
|
242
248
|
|
|
249
|
+
let itemData;
|
|
243
250
|
// create the data and save it in the item node
|
|
244
|
-
|
|
251
|
+
if (SdtfPrimitiveTypeGuard.isBooleanType(typeHint) || SdtfPrimitiveTypeGuard.isColorType(typeHint) || SdtfPrimitiveTypeGuard.isNumberType(typeHint) || SdtfPrimitiveTypeGuard.isStringType(typeHint)) {
|
|
252
|
+
itemData = new SDTFItemData(typeHint, await item.getContent(), attributes?.attributes!)
|
|
253
|
+
} else {
|
|
254
|
+
itemData = new SDTFItemData(typeHint, async () => {
|
|
255
|
+
return await item.getContent();
|
|
256
|
+
}, attributes?.attributes!);
|
|
257
|
+
}
|
|
245
258
|
itemDef.data.push(itemData)
|
|
246
259
|
|
|
247
260
|
return itemDef;
|