Skip to content

Commit

Permalink
fix(bindgen): Address issues with multiple input and output files wit…
Browse files Browse the repository at this point in the history 
…h an option
  • Loading branch information
@thewtex
thewtex committed Sep 21, 2023
1 parent f661729 commit eeb8833
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 23 deletions.
2 changes: 1 addition & 1 deletion packages/compare-images/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
".": {
"types": "./dist/src/index.d.ts",
"browser": "./dist/bundles/compare-images.js",
"node": "./dist/bundles/compare-images.node.js",
"node": "./dist/bundles/compare-images-node.js",
"default": "./dist/bundles/compare-images.js"
}
},
Expand Down
6 changes: 3 additions & 3 deletions src/bindgen/typescript/demo/input-parameters-demo-typescript.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function inputParametersDemoTypeScript(functionName, indent, parameter, required
result += `${indent}${indent}model.${modelProperty}.set("${parameterName}", ${textValue})\n`
result += `${indent}${indent}const details = document.getElementById("${functionName}-${parameter.name}-details")\n`
result += `${indent}${indent}details.innerHTML = \`<pre>$\{globalThis.escapeHtml(model.${modelProperty}.get("${parameterName}").data.substring(0, 50) + ' ...')}</pre>\`\n`
result += `${indent}${indent}details.disabled = false\n`
}
result += `${indent}${indent}details.disabled = false\n`
result += `${indent}})\n\n`
break
case 'INPUT_BINARY_FILE':
Expand All @@ -49,8 +49,8 @@ function inputParametersDemoTypeScript(functionName, indent, parameter, required
result += `${indent}${indent}const details = document.getElementById("${functionName}-${parameter.name}-details")\n`
const binaryDataProp = parameterType.includes('FILE') ? '.data' : ''
result += `${indent}${indent}details.innerHTML = \`<pre>$\{globalThis.escapeHtml(model.${modelProperty}.get("${parameterName}")${binaryDataProp}.subarray(0, 50).toString() + ' ...')}</pre>\`\n`
result += `${indent}${indent}details.disabled = false\n`
}
result += `${indent}${indent}details.disabled = false\n`
result += `${indent}})\n\n`
break
case 'TEXT':
Expand Down Expand Up @@ -138,4 +138,4 @@ function inputParametersDemoTypeScript(functionName, indent, parameter, required
return result
}

export default inputParametersDemoTypeScript
export default inputParametersDemoTypeScript
79 changes: 61 additions & 18 deletions src/bindgen/typescript/function-module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,28 @@ import interfaceJsonTypeToInterfaceType from '../interface-json-type-to-interfac
import interfaceJsonTypeToTypeScriptType from './interface-json-type-to-typescript-type.js'
import writeIfOverrideNotPresent from '../write-if-override-not-present.js'

function readFileIfNotInterfaceType(forNode, interfaceType, varName, indent) {
function readFileIfNotInterfaceType(forNode, interfaceType, varName, indent, isArray) {
if (forNode) {
return `${indent}mountDirs.add(path.dirname(${varName} as string))\n`
if (isArray) {
return `${indent}value.forEach((p) => mountDirs.add(path.dirname(p) as string))\n`
} else {
return `${indent}mountDirs.add(path.dirname(value as string))\n`
}

} else {
if (interfaceType === 'TextFile') {
return `${indent}let ${varName}File = ${varName}\n${indent}if (${varName} instanceof File) {\n${indent} const ${varName}Buffer = await ${varName}.arrayBuffer()\n${indent} ${varName}File = { path: ${varName}.name, data: new TextDecoder().decode(${varName}Buffer) }\n${indent}}\n`
if (isArray) {
return `${indent}${varName}.map((v) => {\n${indent}${indent}let vFile = v\n${indent}${indent}if (v instanceof File) {\n${indent}${indent} const vBuffer = await v.arrayBuffer()\n${indent}${indent} vFile = { path: v.name, data: new TextDecoder().decode(vBuffer) }\n${indent}${indent}}\n${indent}})\n`
} else {
return `${indent}let ${varName}File = ${varName}\n${indent}if (${varName} instanceof File) {\n${indent} const ${varName}Buffer = await ${varName}.arrayBuffer()\n${indent} ${varName}File = { path: ${varName}.name, data: new TextDecoder().decode(${varName}Buffer) }\n${indent}}\n`
}
} else {
return `${indent}let ${varName}File = ${varName}\n${indent}if (${varName} instanceof File) {\n${indent} const ${varName}Buffer = await ${varName}.arrayBuffer()\n${indent} ${varName}File = { path: ${varName}.name, data: new Uint8Array(${varName}Buffer) }\n${indent}}\n`
if (isArray) {
return `${indent}${varName}.map((v) => {\n${indent}let vFile = v\n${indent}${indent}if (v instanceof File) {\n${indent}${indent} const vBuffer = await v.arrayBuffer()\n${indent}${indent} vFile = { path: v.name, data: new Uint8Array(vBuffer) }\n${indent}${indent}}\n${indent}})\n`
} else {
return `${indent}let ${varName}File = ${varName}\n${indent}if (${varName} instanceof File) {\n${indent} const ${varName}Buffer = await ${varName}.arrayBuffer()\n${indent} ${varName}File = { path: ${varName}.name, data: new Uint8Array(${varName}Buffer) }\n${indent}}\n`

}
}
}
}
Expand Down Expand Up @@ -168,9 +182,15 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
interfaceJson.outputs.forEach((output) => {
if (interfaceJsonTypeToInterfaceType.has(output.type)) {
const interfaceType = interfaceJsonTypeToInterfaceType.get(output.type)
const isArray = output.itemsExpectedMax > 1
if (interfaceType.includes('File')) {
const camel = camelCase(output.name)
functionContent += ` const ${camel}Path = typeof options.${camel}Path === 'undefined' ? '${camel}' : options.${camel}Path\n`
if (isArray) {
const defaultData = interfaceType === 'BinaryFile' ? 'new Uint8Array()' : "''"
functionContent += ` const ${camel}PipelineOutputs = typeof options.${camel}Path !== 'undefined' ? options.${camel}Path.map((p) => { return { type: InterfaceTypes.${interfaceType}, data: { path: p, data: ${defaultData} }}}) : []\n`
} else {
functionContent += ` const ${camel}Path = options.${camel}Path ?? '${camel}'\n`
}
}
}
})
Expand All @@ -182,8 +202,13 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
if (!forNode && interfaceType.includes('File')) {
const camel = camelCase(output.name)
const defaultData = interfaceType === 'BinaryFile' ? 'new Uint8Array()' : "''"
functionContent += ` { type: InterfaceTypes.${interfaceType}, data: { path: ${camel}Path, data: ${defaultData} }},\n`
} else {
const isArray = output.itemsExpectedMax > 1
if (isArray) {
functionContent += ` ...${camel}PipelineOutputs,\n`
} else {
functionContent += ` { type: InterfaceTypes.${interfaceType}, data: { path: ${camel}Path, data: ${defaultData} }},\n`
}
} else if (!interfaceType.includes('File')) {
functionContent += ` { type: InterfaceTypes.${interfaceType} },\n`
}
}
Expand All @@ -194,7 +219,8 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
const interfaceType = interfaceJsonTypeToInterfaceType.get(input.type)
if (interfaceType.includes('File')) {
const camel = camelCase(input.name)
functionContent += readFileIfNotInterfaceType(forNode, interfaceType, camel, ' ')
const isArray = input.itemsExpectedMax > 1
functionContent += readFileIfNotInterfaceType(forNode, interfaceType, camel, ' ', isArray)
}
}
})
Expand Down Expand Up @@ -250,17 +276,34 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
if (interfaceJsonTypeToInterfaceType.has(output.type)) {
const interfaceType = interfaceJsonTypeToInterfaceType.get(output.type)
let name = ` const ${camel}Name = '${outputCount.toString()}'\n`
const isArray = output.itemsExpectedMax > 1 ? '[]' : ''
if (interfaceType.includes('File')) {
if (forNode) {
name = ` const ${camel}Name = typeof options.${camel}Path === 'undefined' ? '${camel}' : options.${camel}Path\n`
if (isArray) {
name = ''
} else {
name = ` const ${camel}Name = options.${camel}Path ?? '${camel}'\n`
}
} else {
name = ` const ${camel}Name = ${camel}Path\n`
if (isArray) {
name = ''
} else {
name = ` const ${camel}Name = ${camel}Path\n`
}
}
}
functionContent += name
functionContent += ` args.push(${camel}Name)\n`
if (isArray) {
functionContent += ` options.${camel}Path?.forEach((p) => args.push(p))\n`
} else {
functionContent += ` args.push(${camel}Name)\n`
}
if (forNode && interfaceType.includes('File')) {
functionContent += ` mountDirs.add(path.dirname(${camel}Name))\n`
if (isArray) {
functionContent += ` options.${camel}Path?.forEach((p) => mountDirs.add(path.dirname(p)))\n`
} else {
functionContent += ` mountDirs.add(path.dirname(${camel}Name))\n`
}
}
functionContent += '\n'
outputCount++
Expand Down Expand Up @@ -294,15 +337,15 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
const interfaceType = interfaceJsonTypeToInterfaceType.get(parameter.type)
if (interfaceType.includes('File')) {
// for files
functionContent += readFileIfNotInterfaceType(forNode, interfaceType, 'value', ' ')
if (forNode) {
functionContent += ' mountDirs.add(path.dirname(value as string))\n'
functionContent += ' args.push(value as string)\n\n'
functionContent += ' args.push(value as string)\n'
} else {
functionContent += readFileIfNotInterfaceType(forNode, interfaceType, 'value', ' ', false)
functionContent += ` inputs.push({ type: InterfaceTypes.${interfaceType}, data: valueFile as ${interfaceType} })\n`
functionContent += ` const name = value instanceof File ? value.name : (valueFile as ${interfaceType}).path\n`

functionContent += ' args.push(name)\n\n'
functionContent += ' args.push(name)\n'
}
} else if (interfaceType.includes('Stream')) {
// for Streams
Expand All @@ -325,7 +368,7 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
if (interfaceType.includes('File')) {
// for files
functionContent += ` const ${camel} = options.${camel}\n`
functionContent += readFileIfNotInterfaceType(forNode, interfaceType, camel, ' ')
functionContent += readFileIfNotInterfaceType(forNode, interfaceType, camel, ' ', false)
functionContent += ` args.push('--${parameter.name}')\n\n`
let name = ` const name = ${camel} as string\n`
if (!forNode) {
Expand All @@ -352,7 +395,7 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
functionContent += ' }\n'
})

const outputsVar = interfaceJson.outputs.length ? ' outputs\n' : ''
const outputsVar = interfaceJson.outputs.filter(o => !o.type.includes('FILE') || !forNode).length ? ' outputs\n' : ''
if (forNode) {
functionContent += `\n const pipelinePath = path.join(path.dirname(import.meta.url.substring(7)), '..', 'pipelines', '${moduleKebabCase}')\n\n`
const mountDirsArg = needMountDirs ? ', mountDirs' : ''
Expand All @@ -374,7 +417,7 @@ function functionModule (srcOutputDir, forNode, interfaceJson, modulePascalCase,
if (interfaceType.includes('TextStream') || interfaceType.includes('BinaryStream')) {
functionContent += ` ${camel}: (outputs[${index.toString()}].data as ${interfaceType}).data,\n`
} else if (forNode && interfaceType.includes('File')) {
functionContent += ` ${camel}: outputs[${index.toString()}].data as string,\n`
// Written to disk
} else {
functionContent += ` ${camel}: outputs[${index.toString()}].data as ${interfaceType},\n`
}
Expand Down
2 changes: 1 addition & 1 deletion src/bindgen/typescript/results-module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function resultsModule (srcOutputDir, interfaceJson, forNode, modulePascalCase,
resultsImportTypes.add('JsonCompatible')
}
if (forNode && outputType.includes('File')) {
resultContent += ` ${camelCase(output.name)}: string\n\n`
// Written to disk
} else {
if (typesRequireImport.includes(outputType)) {
resultsImportTypes.add(outputType)
Expand Down

0 comments on commit eeb8833

Please sign in to comment.