* Handle complex nested types in arguments

packages/webidl/src/webidldefs.pp

@@ -64,6 +64,7 @@ Type
     wibtError,
     wibtDOMException,
     // arrays
+    wibtVariantArray,
     wibtArrayBuffer,
     wibtArrayBufferView,
     wibtDataView,
@@ -111,6 +112,7 @@ const
     'Function',
     'Error',
     'DOMException',
+    'VariantArray',
     'ArrayBuffer',
     'ArrayBufferView',
     'DataView',

packages/webidl/src/webidltopas.pp

@@ -1465,6 +1465,7 @@ Var
   I: Integer;
   CD: TIDLArgumentDefinition;
   DL: TIDLDefinitionList;
+  ODef : TIDLDefinition absolute posEl;
 
 begin
   For I:=0 to aList.Count-1 do
@@ -1473,8 +1474,13 @@ begin
     if Not (DL is TIDLPartialDefinitionList) then
       begin
       CD:=TIDLArgumentDefinition.Create(Nil,aName,PosEl.SrcFile,PosEl.Line,PosEl.Column);
-      CD.ArgumentType:=TIDLTypeDefDefinition.Create(CD,'',PosEl.SrcFile,PosEl.Line,PosEl.Column);
+      if PosEl is TIDLTypeDefDefinition then
+        CD.ArgumentType:=TIDLTypeDefDefinitionClass(Posel.ClassType).Create(CD,'',PosEl.SrcFile,PosEl.Line,PosEl.Column)
+      else
+        CD.ArgumentType:=TIDLTypeDefDefinition.Create(CD,'',PosEl.SrcFile,PosEl.Line,PosEl.Column);
       CD.ArgumentType.TypeName:=aTypeName;
+      if (PosEl is TIDLDefinition) and (ODef.Data is TPasData) then
+        CD.ArgumentType.Data:=ClonePasData(ODef.Data as TPasData,CD.ArgumentType);
       DL.Add(CD);
       CD.Data:=CreatePasData(aPasName,CD,false);
       ResolveTypeDef(CD.ArgumentType);
@@ -2054,6 +2060,7 @@ begin
   else if D Is TIDLDictionaryDefinition then
     ResolveTypeDefs(TIDLDictionaryDefinition(D).Members)
   else if D is TIDLIncludesDefinition then
+    //
   else if D Is TIDLFunctionDefinition then
     begin
     FD:=TIDLFunctionDefinition(D);
@@ -2092,9 +2099,11 @@ begin
     ResolveTypeDef(DMD.DefaultValue);
     end
   else if D is TIDLEnumDefinition then
+    //
   else if D is TIDLSetlikeDefinition then
     ResolveTypeDef(TIDLSetlikeDefinition(D).ElementType)
   else if D is TIDLImplementsOrIncludesDefinition then
+    //
   else if D is TIDLIterableDefinition then
     begin
     IT:=TIDLIterableDefinition(D);

packages/webidl/tests/tcwebidl2wasmjob.pas

@@ -320,7 +320,7 @@ procedure TCustomTestWebIDL2WasmJob.OnLog(Sender: TObject;
 begin
   if LogType=cltInfo then ;
   if Sender=nil then ;
-  writeln('TCustomTestWebIDL2WasmJob.OnLog ',Msg);
+  Status('TCustomTestWebIDL2WasmJob.OnLog '+Msg);
 end;
 
 procedure TCustomTestWebIDL2WasmJob.Setup;
@@ -1460,7 +1460,7 @@ procedure TTestWebIDL2WasmJob.TestWJ_IntfFunction_NestedUnionSequence;
 begin
   TestWebIDL([
   'interface Attr {',
-  '  long roundRect((unrestricted double or DOMPointInit or sequence<(unrestricted double or DOMPointInit)>) radii);',
+  '  long roundRect((double or sequence<(double or long)>) radii);',
   '};',
   ''],
 [
@@ -1474,23 +1474,31 @@ begin
  '    TJSAttr',
  '    --------------------------------------------------------------------}',
  '',
+ '   TVariantDynArray = IJSArray; // array of Variant',
  '  IJSAttr = interface(IJSObject)',
- '    [''{AA94F48A-2BFB-3877-82A6-208CA4B2AF2A}'']',
- '    function vibrate: IJSFloat32Array;',
+ '    [''{AA94F48A-0CA1-3A6F-A546-208CA4B2AF2A}'']',
+ '    function roundRect(aRadii: Double): Integer; overload;',
+ '    function roundRect(const aRadii: TVariantDynArray): Integer; overload;',
  '  end;',
  '',
  '  TJSAttr = class(TJSObject,IJSAttr)',
  '  Private',
  '  Public',
- '    function vibrate: IJSFloat32Array;',
+ '    function roundRect(aRadii: Double): Integer; overload;',
+ '    function roundRect(const aRadii: TVariantDynArray): Integer; overload;',
  '    class function Cast(const Intf: IJSObject): IJSAttr;',
  '  end;',
  '',
  'implementation',
  '',
- 'function TJSAttr.vibrate: IJSFloat32Array;',
+ 'function TJSAttr.roundRect(aRadii: Double): Integer; overload;',
  'begin',
- '  Result:=InvokeJSObjectResult(''vibrate'',[],TJSArray) as IJSFloat32Array;',
+ '  Result:=InvokeJSLongIntResult(''roundRect'',[aRadii]);',
+ 'end;',
+ '',
+ 'function TJSAttr.roundRect(const aRadii: TVariantDynArray): Integer; overload;',
+ 'begin',
+ '  Result:=InvokeJSLongIntResult(''roundRect'',[aRadii]);',
  'end;',
  '',
  'class function TJSAttr.Cast(const Intf: IJSObject): IJSAttr;',