ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

few more minor renames

Browse Source
This commit is contained in:
Kurt Hutten Irev-Dev
2024-09-09 22:10:02 +10:00
parent 63dea715bc
commit bb265ca833
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/std/sketch.ts
View File

@ -1018,7 +1018,7 @@ export const circle: SketchLineHelper = {
{
varExpression: x,
varDetails: {
type: 'objectPropertyArray',
type: 'arrayInObject',
index: 0,
key: 'center',
argType: 'xAbsolute',
@ -1028,7 +1028,7 @@ export const circle: SketchLineHelper = {
{
varExpression: y,
varDetails: {
type: 'objectPropertyArray',
type: 'arrayInObject',
index: 1,
key: 'center',
argType: 'yAbsolute',

14
src/lang/std/sketchcombos.ts
View File

@ -1422,15 +1422,15 @@ export function removeSingleConstraint({
if (
varValue.type !== 'objectProperty' &&
varValue.type !== 'arrayOrObjItem' &&
varValue.type !== 'objectPropertyArray'
varValue.type !== 'arrayInObject'
)
return
const rawLiteralArrayInObject = rawValues.find(
(rawValue) =>
rawValue.varDetails.type === 'objectPropertyArray' &&
rawValue.varDetails.type === 'arrayInObject' &&
rawValue.varDetails.key === inputDetails.key &&
rawValue.varDetails.index ===
(varValue.type === 'objectPropertyArray'
(varValue.type === 'arrayInObject'
? varValue.index
: -1)
)
@ -1438,13 +1438,13 @@ export function removeSingleConstraint({
(rawValue) =>
(rawValue.varDetails.type === 'objectProperty' ||
rawValue.varDetails.type === 'arrayOrObjItem' ||
rawValue.varDetails.type === 'objectPropertyArray') &&
rawValue.varDetails.type === 'arrayInObject') &&
rawValue.varDetails.key === inputDetails.key
)
if (
inputDetails.type === 'arrayInObject' &&
rawLiteralArrayInObject?.varDetails.type ===
'objectPropertyArray' &&
'arrayInObject' &&
rawLiteralArrayInObject?.varDetails.index ===
inputDetails.index &&
rawLiteralArrayInObject?.varDetails.key === inputDetails.key
@ -1462,7 +1462,7 @@ export function removeSingleConstraint({
varValue.key === inputDetails.key
) {
otherThing[inputDetails.key] = rawLiteralObjProp.varDetails.value
} else if (varValue.type === 'objectPropertyArray') {
} else if (varValue.type === 'arrayInObject') {
if (!arrayDetailsNameBetterLater[varValue.key])
arrayDetailsNameBetterLater[varValue.key] = []
arrayDetailsNameBetterLater[varValue.key][varValue.index] =
@ -1831,7 +1831,7 @@ export function transformAstSketchLines({
} else if (a?.argPosition?.type === 'arrayInObject') {
inputs.push({
varDetails: {
type: 'objectPropertyArray',
type: 'arrayInObject',
key: a.argPosition.key,
index: a.argPosition.index,
value: nodeMeta.node,

6
src/lang/std/stdTypes.ts
View File

@ -112,8 +112,8 @@ export interface ArrayOrObjItemInput<T> {
value: T
}
export interface ObjectPropertyArrayInput<T> {
type: 'objectPropertyArray'
export interface ArrayInObject<T> {
type: 'arrayInObject'
key: VarValueKeys
argType: LineInputsType | 'radius'
index: 0 | 1
@ -125,7 +125,7 @@ export type _VarValue<T> =
| ArrayItemInput<T>
| ObjectPropertyInput<T>
| ArrayOrObjItemInput<T>
| ObjectPropertyArrayInput<T>
| ArrayInObject<T>
export type VarValue = _VarValue<Expr>
export type RawValue = _VarValue<Literal>