VSinerva/freesewing
1
0
Fork 0
Code Activity

wip: Added part-level dependencies

Browse source 
Restructured code a bit to handle all part-level config in one call.

Removed check in shorthand for debug as it's no longer used.
Updated tests to not fall over on different error message format in
newer NodeJS versions
This commit is contained in:
joostdecock 2022-08-13 18:33:06 +02:00
parent 689f908f68
commit 4cf9c3bd47
5 changed files with 187 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

43
packages/core/src/utils.js
View file

@ -390,26 +390,26 @@ export const generatePartTransform = (x, y, rotate, flipX, flipY, part) => {
export const decoratePartDependency = (obj, name) => (typeof obj === 'function') ? { draft: obj, name } : obj
// Add part-level options
export const addOptions = (part, config) => {
const addPartOptions = (part, config) => {
if (part.options) {
for (const optionName in part.options) {
config.options[optionName] = part.options[optionName]
}
}
if (part.from) addOptions(part.from, config)
if (part.from) addPartOptions(part.from, config)
return config
}
// Add part-level measurements
export const addMeasurements = (part, config, list=false) => {
const addPartMeasurements = (part, config, list=false) => {
if (!list) list = config.measurements
? [...config.measurements]
: []
if (part.measurements) {
for (const m of part.measurements) list.push(m)
}
if (part.from) addMeasurements(part.from, config, list)
if (part.from) addPartMeasurements(part.from, config, list)
// Weed out duplicates
config.measurements = [...new Set(list)]
@ -418,7 +418,7 @@ export const addMeasurements = (part, config, list=false) => {
}
// Add part-level optional measurements
export const addOptionalMeasurements = (part, config, list=false) => {
const addPartOptionalMeasurements = (part, config, list=false) => {
if (!list) list = config.optionalMeasurements
? [...config.optionalMeasurements]
: []
@ -428,7 +428,7 @@ export const addOptionalMeasurements = (part, config, list=false) => {
if (config.measurements.indexOf(m) === -1) list.push(m)
}
}
if (part.from) addOptionalMeasurements(part.from, config, list)
if (part.from) addPartOptionalMeasurements(part.from, config, list)
// Weed out duplicates
config.optionalMeasurements = [...new Set(list)]
@ -437,3 +437,34 @@ export const addOptionalMeasurements = (part, config, list=false) => {
}
const addDependencies = (dep, current) => {
// Current dependencies
const list = []
if (Array.isArray(current)) list.push(...current)
else if (typeof current === 'string') list.push(current)
if (Array.isArray(dep)) list.push(...dep)
else if (typeof dep === 'string') list.push(dep)
return [...new Set(list)]
}
// Add part-level dependencies
export const addPartDependencies = (part, config) => {
if (part.after) {
config.dependencies[part.name] = addDependencies(config.dependencies[part.name], part.after)
}
return config
}
export const addPartConfig = (part, config) => {
config = addPartOptions(part, config)
config = addPartMeasurements(part, config)
config = addPartOptionalMeasurements(part, config)
config = addPartDependencies(part, config)
return config
}