@player-tools/xlr-utils 0.4.2--canary.63.1238 → 0.4.2-next.0
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/index.cjs.js +3 -3
- package/dist/index.esm.js +3 -3
- package/package.json +2 -2
- package/src/validation-helpers.ts +2 -2
package/dist/index.cjs.js
CHANGED
|
@@ -322,9 +322,9 @@ function resolveReferenceNode(genericReference, typeToFill) {
|
|
|
322
322
|
return filledInNode;
|
|
323
323
|
}
|
|
324
324
|
function computeEffectiveObject(base, operand, errorOnOverlap = true) {
|
|
325
|
-
var _a, _b;
|
|
326
|
-
const baseObjectName = (_a = base.name) != null ? _a : "object literal";
|
|
327
|
-
const operandObjectName = (
|
|
325
|
+
var _a, _b, _c, _d;
|
|
326
|
+
const baseObjectName = (_b = (_a = base.name) != null ? _a : base.title) != null ? _b : "object literal";
|
|
327
|
+
const operandObjectName = (_d = (_c = operand.name) != null ? _c : operand.title) != null ? _d : "object literal";
|
|
328
328
|
const newObject = __spreadProps$1(__spreadValues$1({}, base), {
|
|
329
329
|
name: `${baseObjectName} & ${operandObjectName}`,
|
|
330
330
|
description: `Effective type combining ${baseObjectName} and ${operandObjectName}`,
|
package/dist/index.esm.js
CHANGED
|
@@ -295,9 +295,9 @@ function resolveReferenceNode(genericReference, typeToFill) {
|
|
|
295
295
|
return filledInNode;
|
|
296
296
|
}
|
|
297
297
|
function computeEffectiveObject(base, operand, errorOnOverlap = true) {
|
|
298
|
-
var _a, _b;
|
|
299
|
-
const baseObjectName = (_a = base.name) != null ? _a : "object literal";
|
|
300
|
-
const operandObjectName = (
|
|
298
|
+
var _a, _b, _c, _d;
|
|
299
|
+
const baseObjectName = (_b = (_a = base.name) != null ? _a : base.title) != null ? _b : "object literal";
|
|
300
|
+
const operandObjectName = (_d = (_c = operand.name) != null ? _c : operand.title) != null ? _d : "object literal";
|
|
301
301
|
const newObject = __spreadProps$1(__spreadValues$1({}, base), {
|
|
302
302
|
name: `${baseObjectName} & ${operandObjectName}`,
|
|
303
303
|
description: `Effective type combining ${baseObjectName} and ${operandObjectName}`,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@player-tools/xlr-utils",
|
|
3
|
-
"version": "0.4.2
|
|
3
|
+
"version": "0.4.2-next.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"jsonc-parser": "^2.3.1"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@player-tools/xlr": "0.4.2
|
|
13
|
+
"@player-tools/xlr": "0.4.2-next.0",
|
|
14
14
|
"@typescript/vfs": "^1.4.0",
|
|
15
15
|
"@babel/runtime": "7.15.4"
|
|
16
16
|
},
|
|
@@ -190,8 +190,8 @@ export function computeEffectiveObject(
|
|
|
190
190
|
operand: ObjectType,
|
|
191
191
|
errorOnOverlap = true
|
|
192
192
|
): ObjectType {
|
|
193
|
-
const baseObjectName = base.name ?? 'object literal';
|
|
194
|
-
const operandObjectName = operand.name ?? 'object literal';
|
|
193
|
+
const baseObjectName = base.name ?? base.title ?? 'object literal';
|
|
194
|
+
const operandObjectName = operand.name ?? operand.title ?? 'object literal';
|
|
195
195
|
const newObject = {
|
|
196
196
|
...base,
|
|
197
197
|
name: `${baseObjectName} & ${operandObjectName}`,
|