* Namespaced RTL

packages/rtl/generics.strings.pas

@@ -1,19 +0,0 @@
-unit Generics.Strings;
-
-{$Mode Delphi}
-
-interface
-
-resourcestring
-  SArgumentOutOfRange = 'Argument out of range';
-  //SArgumentNilNode = 'Node is nil';
-  //SDuplicatesNotAllowed = 'Duplicates not allowed in dictionary';
-  //SCollectionInconsistency = 'Collection inconsistency';
-  //SCollectionDuplicate = 'Collection does not allow duplicates';
-  //SDictionaryKeyDoesNotExist = 'Dictionary key does not exist';
-  //SItemNotFound = 'Item not found';
-
-implementation
-
-end.
-

packages/rtl/namespaced/Api.JQuery.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Api.JQuery;
+{$include ../src/libjquery.pas}

packages/rtl/namespaced/Browser.Console.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Browser.Console;
+{$include ../src/browserconsole.pas}

packages/rtl/namespaced/Browser.ScriptLoader.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Browser.ScriptLoader;
+{$include ../src/Rtl.ScriptLoader.pas}

packages/rtl/namespaced/Browser.TemplateLoader.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Browser.TemplateLoader;
+{$include ../src/Rtl.TemplateLoader.pas}

packages/rtl/namespaced/Browser.UnitLoader.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit Browser.UnitLoader;
+{$include ../src/Rtl.UnitLoader.pas}

packages/rtl/namespaced/BrowserApi.Audio.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.Audio;
+{$include ../src/webaudio.pas}

packages/rtl/namespaced/BrowserApi.BlueTooth.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.BlueTooth;
+{$include ../src/webbluetooth.pas}

packages/rtl/namespaced/BrowserApi.LoadHelper.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.LoadHelper;
+{$include ../src/Rtl.BrowserLoadHelper.pas}

packages/rtl/namespaced/BrowserApi.RTC.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.RTC;
+{$include ../src/webrtc.pas}

packages/rtl/namespaced/BrowserApi.SVG.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.SVG;
+{$include ../src/websvg.pas}

packages/rtl/namespaced/BrowserApi.Web.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.Web;
+{$include ../src/web.pas}

packages/rtl/namespaced/BrowserApi.WebAssembly.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.WebAssembly;
+{$include ../src/webassembly.pas}

packages/rtl/namespaced/BrowserApi.WebGL.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.WebGL;
+{$include ../src/webgl.pas}

packages/rtl/namespaced/BrowserApi.WebOrWorker.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.WebOrWorker;
+{$include ../src/weborworker.pas}

packages/rtl/namespaced/BrowserApi.Worker.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit BrowserApi.Worker;
+{$include ../src/webworker.pas}

packages/rtl/namespaced/HTML.Actions.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit HTML.Actions;
+{$include ../src/Rtl.HTMLActions.pas}

packages/rtl/namespaced/HTML.EventNames.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit HTML.EventNames;
+{$include ../src/Rtl.HTMLEventNames.pas}

packages/rtl/namespaced/HTML.Translate.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit HTML.Translate;
+{$include ../src/Rtl.HTMLTranslate.pas}

packages/rtl/namespaced/HTML.Utils.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit HTML.Utils;
+{$include ../src/Rtl.HTMLUtils.pas}

packages/rtl/namespaced/JSApi.JS.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+Unit JSApi.JS;
+{$i ../src/js.pas}

packages/rtl/namespaced/NodeApi.Events.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit NodeApi.Events;
+{$include ../src/node.events.pas}

packages/rtl/namespaced/NodeApi.JS.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit NodeApi.JS;
+{$include ../src/nodejs.pas}

packages/rtl/namespaced/System.ArrayUtils.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.ArrayUtils;
+{$include ../src/arrayutils.pas}

packages/rtl/namespaced/System.Class2Pas.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Class2Pas;
+{$include ../src/class2pas.pas}

packages/rtl/namespaced/System.Classes.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Classes;
+{$include ../src/classes.pas}

packages/rtl/namespaced/System.Contnrs.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Contnrs;
+{$include ../src/contnrs.pas}

packages/rtl/namespaced/System.DateUtils.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.DateUtils;
+{$include ../src/dateutils.pas}

packages/rtl/namespaced/System.Generics.Collections.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Generics.Collections;
+{$include ../src/generics.collections.pas}

packages/rtl/namespaced/System.Generics.Defaults.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Generics.Defaults;
+{$include ../src/generics.defaults.pas}

packages/rtl/namespaced/System.Generics.Strings.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Generics.Strings;
+{$include ../src/generics.strings.pas}

packages/rtl/namespaced/System.HotReload.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.HotReload;
+{$include ../src/hotreloadclient.pas}

packages/rtl/namespaced/System.Math.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Math;
+{$include ../src/math.pas}

packages/rtl/namespaced/System.RTLConsts.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.RTLConsts;
+{$i ../src/rtlconsts.pas}

packages/rtl/namespaced/System.Res.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Res;
+{$include ../src/p2jsres.pp}

packages/rtl/namespaced/System.ResourceTranslate.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.ResourceTranslate;
+{$include ../src/rstranslate.pp}

packages/rtl/namespaced/System.Router.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Router;
+{$include ../src/webrouter.pp}

packages/rtl/namespaced/System.Rtti.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Rtti;
+{$include ../src/rtti.pas}

packages/rtl/namespaced/System.SimpleLinkedList.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.SimpleLinkedList;
+{$include ../src/simplelinkedlist.pas}

packages/rtl/namespaced/System.StrUtils.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.StrUtils;
+{$include ../src/strutils.pas}

packages/rtl/namespaced/System.SysUtils.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.SysUtils;
+{$i ../src/sysutils.pas}

packages/rtl/namespaced/System.Timer.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Timer;
+{$include ../src/timer.pas}

packages/rtl/namespaced/System.TypInfo.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+Unit System.TypInfo;
+{$i ../src/typinfo.pas}

packages/rtl/namespaced/System.Types.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.Types;
+{$i ../src/types.pas}

packages/rtl/namespaced/System.WebUtils.pas

@@ -0,0 +1,3 @@
+{$DEFINE FPC_DOTTEDUNITS}
+unit System.WebUtils;
+{$include ../src/webutils.pas}

packages/rtl/namespaced/pas2js_rtl_namespaced.lpk

@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CONFIG>
+  <Package Version="5">
+    <Name Value="pas2js_rtl_namespaced"/>
+    <Type Value="RunTimeOnly"/>
+    <Author Value="Mattias Gaertner"/>
+    <AutoUpdate Value="Manually"/>
+    <CompilerOptions>
+      <Version Value="11"/>
+      <SearchPaths>
+        <IncludeFiles Value="../src"/>
+        <UnitOutputDirectory Value="."/>
+      </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <AllowLabel Value="False"/>
+          <UseAnsiStrings Value="False"/>
+          <CPPInline Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <CodeGeneration>
+        <Optimizations>
+          <OptimizationLevel Value="0"/>
+        </Optimizations>
+      </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
+      <Other>
+        <CustomOptions Value="-dPas2js -O- -Jc"/>
+        <CompilerPath Value="$MakeExe(IDE,pas2js)"/>
+        <ExecuteBefore>
+          <Command Value="$MakeExe(IDE,pas2js) -O- -Jc -vbq pas2js_rtl_namespaced.pas"/>
+          <Parsers Count="1">
+            <Item1 Value="Pas2JS"/>
+          </Parsers>
+        </ExecuteBefore>
+      </Other>
+      <SkipCompiler Value="True"/>
+    </CompilerOptions>
+    <Description Value="pas2js RTL - Run Time Library"/>
+    <License Value="Modified LGPL2 as the FPC packages."/>
+    <Version Major="1"/>
+    <Files Count="46">
+      <Item1>
+        <HasRegisterProc Value="True"/>
+      </Item1>
+      <Item2>
+        <Filename Value="System.Classes.pas"/>
+        <UnitName Value="System.Classes"/>
+      </Item2>
+      <Item3>
+        <Filename Value="JSApi.JS.pas"/>
+        <UnitName Value="JSApi.JS"/>
+      </Item3>
+      <Item4>
+        <Filename Value="System.Math.pas"/>
+        <UnitName Value="System.Math"/>
+      </Item4>
+      <Item5>
+        <Filename Value="NodeApi.JS.pas"/>
+        <UnitName Value="NodeApi.JS"/>
+      </Item5>
+      <Item6>
+        <Filename Value="../src/objpas.pas"/>
+        <UnitName Value="ObjPas"/>
+      </Item6>
+      <Item7>
+        <Filename Value="System.RTLConsts.pas"/>
+        <UnitName Value="System.RTLConsts"/>
+      </Item7>
+      <Item8>
+        <Filename Value="../src/system.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+        <UnitName Value="System"/>
+      </Item8>
+      <Item9>
+        <Filename Value="System.SysUtils.pas"/>
+        <UnitName Value="System.SysUtils"/>
+      </Item9>
+      <Item10>
+        <Filename Value="System.Types.pas"/>
+        <UnitName Value="System.Types"/>
+      </Item10>
+      <Item11>
+        <Filename Value="System.TypInfo.pas"/>
+        <UnitName Value="System.TypInfo"/>
+      </Item11>
+      <Item12>
+        <Filename Value="BrowserApi.Web.pas"/>
+        <UnitName Value="BrowserApi.Web"/>
+      </Item12>
+      <Item13>
+        <Filename Value="System.HotReload.pas"/>
+        <UnitName Value="System.HotReload"/>
+      </Item13>
+      <Item14>
+        <Filename Value="System.DateUtils.pas"/>
+        <UnitName Value="System.DateUtils"/>
+      </Item14>
+      <Item15>
+        <Filename Value="System.StrUtils.pas"/>
+        <UnitName Value="System.StrUtils"/>
+      </Item15>
+      <Item16>
+        <Filename Value="System.Contnrs.pas"/>
+        <UnitName Value="System.Contnrs"/>
+      </Item16>
+      <Item17>
+        <Filename Value="Browser.Console.pas"/>
+        <UnitName Value="Browser.Console"/>
+      </Item17>
+      <Item18>
+        <Filename Value="System.Router.pas"/>
+        <UnitName Value="System.Router"/>
+      </Item18>
+      <Item19>
+        <Filename Value="System.Rtti.pas"/>
+        <UnitName Value="System.Rtti"/>
+      </Item19>
+      <Item20>
+        <Filename Value="BrowserApi.WebGL.pas"/>
+        <UnitName Value="BrowserApi.WebGL"/>
+      </Item20>
+      <Item21>
+        <Filename Value="System.Class2Pas.pas"/>
+        <UnitName Value="System.Class2Pas"/>
+      </Item21>
+      <Item22>
+        <Filename Value="Api.JQuery.pas"/>
+        <UnitName Value="Api.JQuery"/>
+      </Item22>
+      <Item23>
+        <Filename Value="System.Timer.pas"/>
+        <UnitName Value="System.Timer"/>
+      </Item23>
+      <Item24>
+        <Filename Value="BrowserApi.Audio.pas"/>
+        <UnitName Value="BrowserApi.Audio"/>
+      </Item24>
+      <Item25>
+        <Filename Value="BrowserApi.BlueTooth.pas"/>
+        <UnitName Value="BrowserApi.BlueTooth"/>
+      </Item25>
+      <Item26>
+        <Filename Value="BrowserApi.SVG.pas"/>
+        <UnitName Value="BrowserApi.SVG"/>
+      </Item26>
+      <Item27>
+        <Filename Value="Browser.ScriptLoader.pas"/>
+        <UnitName Value="Browser.ScriptLoader"/>
+      </Item27>
+      <Item28>
+        <Filename Value="Browser.TemplateLoader.pas"/>
+        <UnitName Value="Browser.TemplateLoader"/>
+      </Item28>
+      <Item29>
+        <Filename Value="Browser.UnitLoader.pas"/>
+        <UnitName Value="Browser.UnitLoader"/>
+      </Item29>
+      <Item30>
+        <Filename Value="BrowserApi.RTC.pas"/>
+        <UnitName Value="BrowserApi.RTC"/>
+      </Item30>
+      <Item31>
+        <Filename Value="BrowserApi.WebAssembly.pas"/>
+        <UnitName Value="BrowserApi.WebAssembly"/>
+      </Item31>
+      <Item32>
+        <Filename Value="BrowserApi.WebOrWorker.pas"/>
+        <UnitName Value="BrowserApi.WebOrWorker"/>
+      </Item32>
+      <Item33>
+        <Filename Value="BrowserApi.Worker.pas"/>
+        <UnitName Value="BrowserApi.Worker"/>
+      </Item33>
+      <Item34>
+        <Filename Value="BrowserApi.LoadHelper.pas"/>
+        <UnitName Value="BrowserApi.LoadHelper"/>
+      </Item34>
+      <Item35>
+        <Filename Value="HTML.Actions.pas"/>
+        <UnitName Value="HTML.Actions"/>
+      </Item35>
+      <Item36>
+        <Filename Value="HTML.EventNames.pas"/>
+        <UnitName Value="HTML.EventNames"/>
+      </Item36>
+      <Item37>
+        <Filename Value="HTML.Translate.pas"/>
+        <UnitName Value="HTML.Translate"/>
+      </Item37>
+      <Item38>
+        <Filename Value="HTML.Utils.pas"/>
+        <UnitName Value="HTML.Utils"/>
+      </Item38>
+      <Item39>
+        <Filename Value="System.ArrayUtils.pas"/>
+        <UnitName Value="System.ArrayUtils"/>
+      </Item39>
+      <Item40>
+        <Filename Value="System.Generics.Collections.pas"/>
+        <UnitName Value="System.Generics.Collections"/>
+      </Item40>
+      <Item41>
+        <Filename Value="System.Generics.Defaults.pas"/>
+        <UnitName Value="System.Generics.Defaults"/>
+      </Item41>
+      <Item42>
+        <Filename Value="System.Generics.Strings.pas"/>
+        <UnitName Value="System.Generics.Strings"/>
+      </Item42>
+      <Item43>
+        <Filename Value="System.Res.pas"/>
+        <UnitName Value="System.Res"/>
+      </Item43>
+      <Item44>
+        <Filename Value="System.ResourceTranslate.pas"/>
+        <UnitName Value="System.ResourceTranslate"/>
+      </Item44>
+      <Item45>
+        <Filename Value="System.SimpleLinkedList.pas"/>
+        <UnitName Value="System.SimpleLinkedList"/>
+      </Item45>
+      <Item46>
+        <Filename Value="System.WebUtils.pas"/>
+        <UnitName Value="System.WebUtils"/>
+      </Item46>
+    </Files>
+    <CompatibilityMode Value="True"/>
+    <UsageOptions>
+      <CustomOptions Value="-dPas2js"/>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>

packages/rtl/namespaced/pas2js_rtl_namespaced.pas

@@ -0,0 +1,21 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install the package.
+ }
+
+unit pas2js_rtl_namespaced;
+
+{$warn 5023 off : no warning about unused units}
+interface
+
+uses
+  System.Classes, JSApi.JS, System.Math, NodeApi.JS, ObjPas, System.RTLConsts, System.SysUtils, System.Types, System.TypInfo, 
+  BrowserApi.Web, System.HotReload, System.DateUtils, System.StrUtils, System.Contnrs, Browser.Console, System.Router, 
+  System.Rtti, BrowserApi.WebGL, System.Class2Pas, Api.JQuery, System.Timer, BrowserApi.Audio, BrowserApi.BlueTooth, 
+  BrowserApi.SVG, Browser.ScriptLoader, Browser.TemplateLoader, Browser.UnitLoader, BrowserApi.RTC, BrowserApi.WebAssembly, 
+  BrowserApi.WebOrWorker, BrowserApi.Worker, BrowserApi.LoadHelper, HTML.Actions, HTML.EventNames, HTML.Translate, HTML.Utils, 
+  System.ArrayUtils, System.Generics.Collections, System.Generics.Defaults, System.Generics.Strings, System.Res, 
+  System.ResourceTranslate, System.SimpleLinkedList, System.WebUtils;
+
+implementation
+
+end.

packages/rtl/pas2js_rtl.pas

@@ -1,17 +0,0 @@
-{ This file was automatically created by Lazarus. Do not edit!
-  This source is only used to compile and install the package.
- }
-
-unit pas2js_rtl;
-
-{$warn 5023 off : no warning about unused units}
-interface
-
-uses
-  Classes, JS, Math, ObjPas, RTLConsts, SysUtils, Types, TypInfo, Web, 
-  hotreloadclient, DateUtils, strutils, contnrs, browserconsole, webrouter, 
-  RTTI, webgl;
-
-implementation
-
-end.

packages/rtl/Rtl.BrowserLoadHelper.pas → packages/rtl/src/Rtl.BrowserLoadHelper.pas

@@ -1,11 +1,31 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2023 by Michael Van Canneyt
+    
+    Loader helper for TStringList, usable in the browser.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.BrowserLoadHelper;
+{$ENDIF}
 
 {$mode objfpc}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, JSApi.JS, BrowserApi.Web;
+{$ELSE}
   Classes, SysUtils, JS, Web;
+{$ENDIF}  
 
 Type
   { TBrowserLoadHelper }

packages/rtl/Rtl.HTMLActions.pas → packages/rtl/src/Rtl.HTMLActions.pas

@@ -1,4 +1,20 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Delphi TActionList-like implementation for the browser.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.HTMLActions;
+{$ENDIF}
 
 {$mode ObjFPC}
 {$H+}
@@ -6,19 +22,13 @@ unit Rtl.HTMLActions;
 interface
 
 uses
-  {$ifdef pas2js}
-  web,
-  {$endif}
-  RTL.HTMLEventNames, Classes, SysUtils, Rtl.HTMLUtils;
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, BrowserApi.Web, HTML.EventNames, HTML.Utils;
+{$ELSE}
+  web, RTL.HTMLEventNames, Classes, SysUtils, Rtl.HTMLUtils;
+{$ENDIF}
 
 Type
-   {$ifndef pas2js}
-   TJSEvent = Class(TObject);
-   TJSElement = class(TObject);
-   TJSHTMLElement = class(TJSElement);
-   TJSHTMLElementArray = array of TJSHTMLElement;
-
-   {$endif}
    THTMLNotifyEvent = Procedure (Sender : TObject; Event : TJSEvent) of object;
    THTMLCustomElementActionList = Class;
 
@@ -173,7 +183,12 @@ Type
 
 implementation
 
-uses StrUtils;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.StrUtils;
+{$ELSE}
+  StrUtils;
+{$ENDIF}
 
 { ----------------------------------------------------------------------
   THTMLCustomElementActionList
@@ -606,14 +621,6 @@ begin
     Result:=inherited HasParent;
 end;
 
-{ ----------------------------------------------------------------------
-  The methods in this last part are either empty or implemented,
-  depending on whether the unit is used in FPC (IDE) or pas2js
-  ----------------------------------------------------------------------}
-
-
-{$ifdef pas2js}
-
 procedure THTMLCustomElementAction.BindElementEvents;
 
 Var
@@ -737,46 +744,5 @@ begin
     end;
 end;
 
-{$else}
-
-procedure THTMLCustomElementAction.BindElementEvents;
-begin
-
-end;
-
-
-procedure THTMLCustomElementAction.Bind;
-begin
-
-end;
-
-procedure THTMLCustomElementAction.HandleEvent(Event: TJSEvent);
-begin
-
-end;
-
-procedure THTMLCustomElementAction.AddClass(const aClass: String);
-begin
-end;
-
-procedure THTMLCustomElementAction.RemoveClass(const aClass: String);
-begin
-
-end;
-
-procedure THTMLCustomElementAction.ToggleClass(const aClass: String);
-
-begin
-
-end;
-
-procedure THTMLCustomElementAction.BindEvents(aEl: TJSElement);
-
-begin
-
-end;
-
-{$endif}
-
 end.
 

packages/rtl/Rtl.HTMLEventNames.pas → packages/rtl/src/Rtl.HTMLEventNames.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2017-2020 by the Pas2JS development team.
+
+    Browser Window & DOM event name definitions
+    
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.HTMLEventNames;
+{$ENDIF}
 
 {$mode ObjFPC}
 {$h+}

packages/rtl/Rtl.HTMLTranslate.pas → packages/rtl/src/Rtl.HTMLTranslate.pas

@@ -12,12 +12,18 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS} 
 unit Rtl.HTMLTranslate;
+{$ENDIF}
 
 interface
 
-Uses SysUtils, JS, Web, Classes, Rtl.HTMLUtils;
-
+Uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, JSApi.JS, BrowserApi.Web, System.Classes, HTML.Utils;
+{$ELSE}  
+  SysUtils, JS, Web, Classes, Rtl.HTMLUtils;
+{$ENDIF}
 (* Language data is a JSON object structure. 
 
   2 file-based formats are supported (see LanguageSource):

packages/rtl/Rtl.HTMLUtils.pas → packages/rtl/src/Rtl.HTMLUtils.pas

@@ -12,12 +12,18 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.HTMLUtils;
+{$ENDIF}
 
 interface
 
-uses JS, Web, SysUtils, DateUtils, Types;
-
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.Web, System.SysUtils, System.DateUtils, System.Types;
+{$ELSE}
+  JS, Web, SysUtils, DateUtils, Types;
+{$ENDIF}
 Type
   IHTMLClient = Interface ['{984EDD58-4F93-40BA-A757-06AC293D11F9}']
     Procedure HTMLLoaded;

packages/rtl/Rtl.ScriptLoader.pas → packages/rtl/src/Rtl.ScriptLoader.pas

@@ -1,8 +1,29 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2019 by Michael Van Canneyt
+
+    This unit implements a HTML script tag loader.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.ScriptLoader;
+{$ENDIF}
 
 interface
 
-uses types;
+uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Types;
+{$ELSE} 
+  Types;
+{$ENDIF}
 
 Type
   TloadedCallBack = Reference to procedure(Data : TObject);
@@ -12,7 +33,12 @@ Procedure loadScripts(scripts : TStringDynArray; callback : TLoadedCallback; Dat
 
 implementation
 
-uses js, web;
+Uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.Web;
+{$ELSE}
+  js, web;
+{$ENDIF}
 
 Procedure loadScripts(scripts : TStringDynArray; callback : TLoadedCallback; Data : TObject);
 

packages/rtl/Rtl.TemplateLoader.pas → packages/rtl/src/Rtl.TemplateLoader.pas

@@ -12,14 +12,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.TemplateLoader;
+{$ENDIF}
 
 {$mode objfpc}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, JSApi.JS, BrowserApi.Web;
+{$ELSE}
   Classes, SysUtils, JS, web;
+{$ENDIF}  
 
 Type
    TFailData = Record
@@ -128,7 +134,12 @@ Function GlobalTemplates : TCustomTemplateLoader;
 
 implementation
 
-uses p2jsres, rtlconsts;
+Uses
+{$IFDEF FPC_DOTTEDUNITS}
+   System.Res, System.RTLConsts;
+{$ELSE}
+   p2jsres, rtlconsts;
+{$ENDIF}
 
 { TCustomTemplateLoader }
 

packages/rtl/Rtl.UnitLoader.pas → packages/rtl/src/Rtl.UnitLoader.pas

@@ -1,10 +1,30 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2019 by Michael Van Canneyt
+
+    This unit implements a Pascal unit loader for the browser.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.UnitLoader;
+{$ENDIF}
 
 interface
 { $define DEBUGUNITLOADER}
 
-uses SysUtils, JS, Types;
-
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, JSApi.JS, System.Types;
+{$ELSE}
+  SysUtils, JS, Types;
+{$ENDIF}
 Type
   EUnitLoader = Class(Exception);
 
@@ -63,7 +83,13 @@ Type
  
 Implementation
 
-uses Rtl.ScriptLoader;
+Uses
+{$IFDEF FPC_DOTTEDUNITS}
+   Rtl.ScriptLoader;
+{$ELSE}
+   Browser.ScriptLoader;
+{$ENDIF}
+
 
 function IndexOfI(arr: TStringDynArray; Name: string): integer;
 begin

packages/rtl/arrayutils.pas → packages/rtl/src/arrayutils.pas

@@ -1,4 +1,20 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Simple TBytes/TWords helpers
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit arrayutils;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch typehelpers}
@@ -6,7 +22,11 @@ unit arrayutils;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Types, System.SysUtils;
+{$ELSE}
   Types, SysUtils;
+{$ENDIF}  
 
 Type
   TBytesHelper = type helper for TBytes

packages/rtl/browserconsole.pas → packages/rtl/src/browserconsole.pas

@@ -19,14 +19,21 @@
   You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free
   Software Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1335, USA.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit browserconsole;
+{$ENDIF}
 
 {$mode objfpc}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.Web, BrowserApi.LoadHelper, System.SysUtils;
+{$ELSE}
   js, web, Rtl.BrowserLoadHelper,sysutils;
+{$ENDIF}
+
 
 Const
   BrowserLineBreak = #10;

packages/rtl/class2pas.pas → packages/rtl/src/class2pas.pas

@@ -10,14 +10,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit class2pas;
+{$ENDIF}
 
 {$mode objfpc}{$H+}
 
 interface
-
 uses
+
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, System.Types, JSApi.JS;
+{$ELSE}
   Classes, SysUtils, Types, JS;
+{$ENDIF}  
 
 function ClassToPas(Const aName : string; Obj: TJSObject; aAncestor : string = ''; recurse : Boolean = False): string; overload;
 function ClassToPas(Const aJSName,aPascalName : string; Obj: TJSObject; aAncestor : string = ''; recurse : Boolean = False): string; overload;

packages/rtl/classes.pas → packages/rtl/src/classes.pas

@@ -10,14 +10,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Classes;
+{$ENDIF}
 
 {$mode objfpc}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.RTLConsts, System.Types, System.SysUtils, JSApi.JS, System.TypInfo, System.Res;
+{$ELSE}
   RTLConsts, Types, SysUtils, JS, TypInfo, p2jsres;
+{$ENDIF}  
 
 type
   TNotifyEvent = procedure(Sender: TObject) of object;
@@ -49,8 +55,8 @@ type
   TListAssignOp = (laCopy, laAnd, laOr, laXor, laSrcUnique, laDestUnique);
   TListSortCompare = function(Item1, Item2: JSValue): Integer;
   TListSortCompareFunc = reference to function (Item1, Item2: JSValue): Integer;
-  TListCallback = Types.TListCallback;
-  TListStaticCallback = Types.TListStaticCallback;
+  TListCallback = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Types.TListCallback;
+  TListStaticCallback = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Types.TListStaticCallback;
   TAlignment = (taLeftJustify, taRightJustify, taCenter);
 
   // Forward class definitions
@@ -1546,7 +1552,11 @@ Const
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SimpleLinkedList;
+{$ELSE}
 uses simplelinkedlist;
+{$ENDIF}
 
 var
   GlobalLoaded,
@@ -10637,7 +10647,7 @@ begin
       else break;
     end;
   end;
-  fToken:=Classes.toString
+  fToken:=TParserToken.toString
 end;
 
 procedure TParser.HandleMinus;
@@ -10920,8 +10930,8 @@ begin
   while parser.NextToken = toPlus do
     begin
     parser.NextToken;   // Get next string fragment
-    if not (parser.Token=Classes.toString) then
-      parser.CheckToken(Classes.toString);
+    if not (parser.Token=TParserToken.toString) then
+      parser.CheckToken(TParserToken.toString);
     ws:=ws+parser.TokenString;
     end;
   Output.WriteByte(Ord(vaWstring));
@@ -10947,7 +10957,7 @@ begin
         WriteDouble(flt);
         parser.NextToken;
       end;
-    classes.toString:
+    TParserToken.toString:
       ProcessWideString('');
     toSymbol:
       begin

packages/rtl/contnrs.pas → packages/rtl/src/contnrs.pas

@@ -11,13 +11,18 @@
 
  **********************************************************************}
 {$mode objfpc}
-
+{$IFNDEF FPC_DOTTEDUNITS}
 unit contnrs;
+{$ENDIF}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, System.Classes;
+{$ELSE}
   SysUtils, Classes;
+{$ENDIF}
 
 
 Type
@@ -438,7 +443,11 @@ Type
 implementation
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS;
+{$ELSE}
   js;
+{$ENDIF}
 
 ResourceString
   DuplicateMsg   = 'An item with key %0:s already exists';

packages/rtl/dateutils.pas → packages/rtl/src/dateutils.pas

@@ -1,5 +1,4 @@
 {$mode objfpc}
-
 {
     This file is part of the Free Pascal run time library.
     Copyright (c) 2018 by the Free Pascal development team
@@ -14,13 +13,18 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-
+{$IFNDEF FPC_DOTTEDUNITS}
 unit DateUtils;
+{$ENDIF}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, System.Math;
+{$ELSE}
   SysUtils, Math;
+{$ENDIF}  
 
 { ---------------------------------------------------------------------
     Various constants
@@ -507,7 +511,12 @@ Function ScanDateTime(APattern,AValue: String; APos : integer = 1) : TDateTime;
 
 implementation
 
-uses  rtlconsts;
+uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.RTLConsts;
+{$ELSE}
+  rtlconsts;
+{$ENDIF}  
 
 const
   TDateTimeEpsilon = 2.2204460493e-16;

packages/rtl/generics.collections.pas → packages/rtl/src/generics.collections.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2023 by Michael Van Canneyt
+      
+    Delphi-compatible generics implementations.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.Collections;
+{$ENDIF}
 
 {$Mode Delphi}
 {$COperators On}
@@ -6,9 +23,15 @@ unit Generics.Collections;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, System.RTLConsts, System.Types,
+  {$IFDEF Pas2js}JSApi.JS,{$ENDIF}
+  System.Generics.Strings, System.Generics.Defaults;
+{$ELSE FPC_DOTTEDUNITS}
   Classes, SysUtils, rtlconsts, Types,
   {$IFDEF Pas2js}JS,{$ENDIF}
   Generics.Strings, Generics.Defaults;
+{$ENDIF}
 
 type
   TCollectionNotification = (cnAdded, cnRemoved, cnExtracted);

packages/rtl/generics.defaults.pas → packages/rtl/src/generics.defaults.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2023 by Michael Van Canneyt
+      
+    Delphi-compatible generics helpers implementations.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Generics.Defaults;
+{$ENDIF}
 
 {$MODE DELPHI}
 

packages/rtl/src/generics.strings.pas

@@ -0,0 +1,35 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2023 by Michael Van Canneyt
+      
+    Delphi-compatible generics string constansts
+    
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
+unit Generics.Strings;
+{$ENDIF}
+
+{$Mode Delphi}
+
+interface
+
+resourcestring
+  SArgumentOutOfRange = 'Argument out of range';
+  //SArgumentNilNode = 'Node is nil';
+  //SDuplicatesNotAllowed = 'Duplicates not allowed in dictionary';
+  //SCollectionInconsistency = 'Collection inconsistency';
+  //SCollectionDuplicate = 'Collection does not allow duplicates';
+  //SDictionaryKeyDoesNotExist = 'Dictionary key does not exist';
+  //SItemNotFound = 'Item not found';
+
+implementation
+
+end.
+

packages/rtl/hotreloadclient.pas → packages/rtl/src/hotreloadclient.pas

@@ -1,10 +1,31 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Hot-reload Client API for compileserver.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit hotreloadclient;
+{$ENDIF}
 
 {$mode objfpc}
 
 interface
 
-uses sysutils, types, js, web;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, System.Types, JSApi.JS, BrowserApi.Web;
+{$ELSE}
+  sysutils, types, js, web;
+{$ENDIF}
 
 Type
 

packages/rtl/js.pas → packages/rtl/src/js.pas

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit JS;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
@@ -18,7 +20,11 @@ unit JS;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Types;
+{$ELSE}
   Types;
+{$ENDIF}
 
 type
   // We cannot use EConvertError or Exception, this would result in a circular dependency.

packages/rtl/libjquery.pas → packages/rtl/src/libjquery.pas

@@ -1,11 +1,33 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2023 by Michael Van Canneyt
+    
+    JQuery API definition
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit libjquery;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
 
 interface
 
-uses js, web;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.Web;
+{$ELSE}
+  js, web;
+{$ENDIF}
 
 Type
   TJQueryTopLeft = record

packages/rtl/math.pas → packages/rtl/src/math.pas

@@ -9,8 +9,10 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
- **********************************************************************}
+ **********************************************************************} 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Math;
+{$ENDIF}
 
 {$mode objfpc}
 

packages/rtl/node.events.pas → packages/rtl/src/node.events.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2023 by Michael Van Canneyt
+    
+    Node.JS Event API definition; also usable in the browser
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit node.events;
+{$ENDIF}
 
 {$mode objfpc}
 {$ModeSwitch externalclass}
@@ -6,7 +23,11 @@ unit node.events;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS;
+{$ELSE}
   JS;
+{$ENDIF}  
 
 Type
   TNJSEventEmitterHandler = reference to procedure(arg : JSValue);

packages/rtl/nodejs.pas → packages/rtl/src/nodejs.pas

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit NodeJS;
+{$ENDIF}
 
 {$mode objfpc}
 {$ModeSwitch externalclass}
@@ -18,7 +20,11 @@ unit NodeJS;
 interface
 
 uses
-  JS, Types, node.events;
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, System.Types, NodeApi.events;
+{$ELSE}
+  JS, Types, Node.Events;
+{$ENDIF}
 
 type
 
@@ -250,10 +256,10 @@ type
     procedure warn(const Obj1 : JSValue); varargs;
   end;
 
-  TNJSEventEmitterHandler = node.events.TNJSEventEmitterHandler;
-  TNJSEventEmitterHandlerArray = node.events.TNJSEventEmitterHandlerArray;
-  TNJSEventEmitter = node.events.TNJSEventEmitter;
-  TNJSEvents = node.events.TNJSEventEmitter;
+  TNJSEventEmitterHandler = {$IFDEF FPC_DOTTEDUNITS}NodeApi.Events{$ELSE}node.events{$ENDIF}.TNJSEventEmitterHandler;
+  TNJSEventEmitterHandlerArray = {$IFDEF FPC_DOTTEDUNITS}NodeApi.Events{$ELSE}node.events{$ENDIF}.TNJSEventEmitterHandlerArray;
+  TNJSEventEmitter = {$IFDEF FPC_DOTTEDUNITS}NodeApi.Events{$ELSE}node.events{$ENDIF}.TNJSEventEmitter;
+  TNJSEvents = {$IFDEF FPC_DOTTEDUNITS}NodeApi.Events{$ELSE}node.events{$ENDIF}.TNJSEventEmitter;
 
   TNJSTimerCallBack = reference to procedure;
 

packages/rtl/p2jsres.pp → packages/rtl/src/p2jsres.pp

@@ -1,4 +1,20 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2023 by Michael Van Canneyt
+    
+    Low-level Pas2JS resource handling.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit p2jsres;
+{$ENDIF}
 
 {$mode objfpc}
 {$h+}
@@ -6,7 +22,11 @@ unit p2jsres;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
 uses types;
+{$ELSE}
+uses System.Types;
+{$ENDIF}
 
 Type
   TResourceSource = (rsJS,rsHTML);
@@ -36,7 +56,12 @@ Procedure LoadHTMLLinkResources(const aURL : String; OnLoad : TResourcesLoadedEn
 
 implementation
 
-uses sysutils, js, web;
+Uses
+{$IFDEF FPC_DOTTEDUNITS}
+ System.SysUtils, JSApi.JS, BrowserApi.Web;
+{$ELSE}
+ sysutils, js, web;
+{$ENDIF}
 
 var
   gMode: TResourceSource;

packages/rtl/pas2js_rtl.lpk → packages/rtl/src/pas2js_rtl.lpk

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="pas2js_rtl"/>
     <Type Value="RunTimeOnly"/>
     <Author Value="Mattias Gaertner"/>
@@ -13,8 +13,8 @@
       <Parsing>
         <SyntaxOptions>
           <AllowLabel Value="False"/>
-          <CPPInline Value="False"/>
           <UseAnsiStrings Value="False"/>
+          <CPPInline Value="False"/>
         </SyntaxOptions>
       </Parsing>
       <CodeGeneration>
@@ -40,9 +40,10 @@
     <Description Value="pas2js RTL - Run Time Library"/>
     <License Value="Modified LGPL2 as the FPC packages."/>
     <Version Major="1"/>
-    <Files Count="26">
+    <Files Count="42">
       <Item1>
         <HasRegisterProc Value="True"/>
+        <AddToUsesPkgSection Value="False"/>
       </Item1>
       <Item2>
         <Filename Value="classes.pas"/>
@@ -58,7 +59,6 @@
       </Item4>
       <Item5>
         <Filename Value="nodejs.pas"/>
-        <AddToUsesPkgSection Value="False"/>
         <UnitName Value="NodeJS"/>
       </Item5>
       <Item6>
@@ -146,7 +146,71 @@
         <Filename Value="websvg.pas"/>
         <UnitName Value="websvg"/>
       </Item26>
+      <Item27>
+        <Filename Value="generics.collections.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item27>
+      <Item28>
+        <Filename Value="generics.defaults.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item28>
+      <Item29>
+        <Filename Value="generics.strings.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item29>
+      <Item30>
+        <Filename Value="rstranslate.pp"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item30>
+      <Item31>
+        <Filename Value="Rtl.BrowserLoadHelper.pas"/>
+      </Item31>
+      <Item32>
+        <Filename Value="Rtl.HTMLActions.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item32>
+      <Item33>
+        <Filename Value="Rtl.HTMLEventNames.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item33>
+      <Item34>
+        <Filename Value="Rtl.HTMLTranslate.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item34>
+      <Item35>
+        <Filename Value="Rtl.HTMLUtils.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item35>
+      <Item36>
+        <Filename Value="Rtl.ScriptLoader.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item36>
+      <Item37>
+        <Filename Value="Rtl.TemplateLoader.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item37>
+      <Item38>
+        <Filename Value="Rtl.UnitLoader.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item38>
+      <Item39>
+        <Filename Value="webassembly.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item39>
+      <Item40>
+        <Filename Value="webrtc.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item40>
+      <Item41>
+        <Filename Value="webutils.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item41>
+      <Item42>
+        <Filename Value="webworker.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+      </Item42>
     </Files>
+    <CompatibilityMode Value="True"/>
     <UsageOptions>
       <CustomOptions Value="-dPas2js"/>
       <UnitPath Value="$(PkgOutDir)"/>

packages/rtl/src/pas2js_rtl.pas

@@ -0,0 +1,16 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install the package.
+ }
+
+unit pas2js_rtl;
+
+{$warn 5023 off : no warning about unused units}
+interface
+
+uses
+  Classes, JS, Math, NodeJS, ObjPas, RTLConsts, SysUtils, Types, TypInfo, Web, hotreloadclient, DateUtils, strutils, contnrs, 
+  browserconsole, webrouter, RTTI, webgl, class2pas, libjquery, timer, webaudio, webbluetooth, websvg, Rtl.BrowserLoadHelper;
+
+implementation
+
+end.

packages/rtl/rstranslate.pp → packages/rtl/src/rstranslate.pp

@@ -10,15 +10,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************} 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit rstranslate;
+{$ENDIF}
 
 {$mode objfpc}
 
 interface
 
 uses
+{$IFNDEF FPC_DOTTEDUNITS}
+  System.SysUtils, JSApi.JS, BrowserApi.Web;
+{$ELSE}
   SysUtils, JS, web;
-
+{$ENDIF}
 Type
 
   { TResourceTranslator }

packages/rtl/rtl.webthreads.pas → packages/rtl/src/rtl.webthreads.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2017-2020 by the Pas2JS development team.
+
+    Threads API for Browser Window & Worker
+    
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Rtl.WebThreads;
+{$ENDIF}
 
 {$mode ObjFPC}
 {$modeswitch externalclass}
@@ -6,7 +23,11 @@ unit Rtl.WebThreads;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, System.SysUtils, System.WasiEnv, BrowserApi.WebAssembly;
+{$ELSE}
   JS, SysUtils, wasienv, webassembly;
+{$ENDIF}  
 
 Const
   // Each thread starts spawning at 1000*IndexOfWorker

packages/rtl/rtlconsts.pas → packages/rtl/src/rtlconsts.pas

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit RTLConsts;
+{$ENDIF}
 
 interface
 

packages/rtl/rtti.pas → packages/rtl/src/rtti.pas

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit RTTI;
+{$ENDIF}
 
 {$mode objfpc}
 {$ModeSwitch advancedrecords}
@@ -18,7 +20,11 @@ unit RTTI;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, System.RTLConsts, System.Types, System.SysUtils, System.TypInfo;
+{$ELSE}
   JS, RTLConsts, Types, SysUtils, TypInfo;
+{$ENDIF}  
 
 resourcestring
   SErrInvokeInvalidCodeAddr = 'CodeAddress is not a function';
@@ -932,7 +938,7 @@ var
 begin
   case jsTypeOf(v) of
     'number':
-      if JS.isInteger(v) then
+      if {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isInteger(v) then
         begin
         i:=NativeInt(v);
         if (i>=low(integer)) and (i<=high(integer)) then
@@ -947,9 +953,9 @@ begin
     'object':
       if v=nil then
         Exit(TValue.Empty)
-      else if JS.isClass(v) and JS.isExt(v,TObject) then
+      else if {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isClass(v) and {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isExt(v,TObject) then
         TypeOfValue:=System.TypeInfo(TClass(v))
-      else if JS.isObject(v) and JS.isExt(v,TObject) then
+      else if {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isObject(v) and {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isExt(v,TObject) then
         TypeOfValue:=System.TypeInfo(TObject(v))
       else if isRecord(v) then
         TypeOfValue:=System.TypeInfo(TObject(v))
@@ -1007,7 +1013,7 @@ end;
 
 function TValue.AsObject: TObject;
 begin
-  if IsObject or (IsClass and not JS.IsObject(GetData)) then
+  if IsObject or (IsClass and not {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.IsObject(GetData)) then
     Result := TObject(GetData)
   else
     raise EInvalidCast.Create(SErrInvalidTypecast);
@@ -1032,7 +1038,7 @@ var
   k: TTypeKind;
 begin
   k:=Kind;
-  Result := (k = tkClassRef) or ((k in [tkClass,tkUnknown]) and not JS.IsObject(GetData));
+  Result := (k = tkClassRef) or ((k in [tkClass,tkUnknown]) and not {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.IsObject(GetData));
 end;
 
 function TValue.AsClass: TClass;
@@ -1066,7 +1072,7 @@ end;
 
 function TValue.AsInteger: Integer;
 begin
-  if JS.isInteger(GetData) then
+  if {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isInteger(GetData) then
     Result:=NativeInt(GetData)
   else
     raise EInvalidCast.Create(SErrInvalidTypecast);
@@ -1074,7 +1080,7 @@ end;
 
 function TValue.AsNativeInt: NativeInt;
 begin
-  if JS.isInteger(GetData) then
+  if {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isInteger(GetData) then
     Result:=NativeInt(GetData)
   else
     raise EInvalidCast.Create(SErrInvalidTypecast);
@@ -1087,7 +1093,7 @@ begin
   k:=Kind;
   if k = tkInterface then
     Result := IInterface(GetData)// ToDo
-  else if (k in [tkClass, tkClassRef, tkUnknown]) and not JS.isObject(GetData) then
+  else if (k in [tkClass, tkClassRef, tkUnknown]) and not {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isObject(GetData) then
     Result := Nil
   else
     raise EInvalidCast.Create(SErrInvalidTypecast);
@@ -1095,7 +1101,7 @@ end;
 
 function TValue.AsString: string;
 begin
-  if js.isString(GetData) then
+  if {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isString(GetData) then
     Result:=String(GetData)
   else
     raise EInvalidCast.Create(SErrInvalidTypecast);
@@ -1108,7 +1114,7 @@ end;
 
 function TValue.AsExtended: Extended;
 begin
-  if js.isNumber(GetData) then
+  if {$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.isNumber(GetData) then
     Result:=Double(GetData)
   else
     raise EInvalidCast.Create(SErrInvalidTypecast);

packages/rtl/simplelinkedlist.pas → packages/rtl/src/simplelinkedlist.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Simple Linked List implementation.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit simplelinkedlist;
+{$ENDIF}
 
 {$mode objfpc}
 
@@ -37,7 +54,11 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE}
 uses sysutils;
+{$ENDIF}
 
 { TLinkedList }
 

packages/rtl/strutils.pas → packages/rtl/src/strutils.pas

@@ -15,12 +15,18 @@
 {$mode objfpc}
 
 {$inline on}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit strutils;
+{$ENDIF}
 
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
   SysUtils, Types;
+{$ELSE}  
+  System.SysUtils, System.Types;
+{$ENDIF}  
 
 { ---------------------------------------------------------------------
     Case insensitive search/replace
@@ -225,7 +231,12 @@ type
 
 implementation
 
-uses js;
+uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS;
+{$ELSE}
+  js;
+{$ENDIF}
 
 { ---------------------------------------------------------------------
    Possibly Exception raising functions

packages/rtl/sysutils.pas → packages/rtl/src/sysutils.pas

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SysUtils;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch typehelpers}
@@ -19,8 +21,13 @@ unit SysUtils;
 
 interface
 
+
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.RTLConsts, JSApi.JS;
+{$ELSE}
   RTLConsts, js;
+{$ENDIF}
 
 procedure FreeAndNil(var Obj);
 
@@ -5771,7 +5778,7 @@ end;
 class function TStringHelper.CompareText(const A: string; const B: string
   ): Integer;
 begin
-  Result:=Sysutils.CompareText(A,B);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.CompareText(A,B);
 end;
 
 
@@ -5807,7 +5814,7 @@ end;
 
 class function TStringHelper.EndsText(const ASubText, AText: string): Boolean;
 begin
-  Result:=(ASubText<>'') and (sysutils.CompareText(System.Copy(AText,System.Length(AText)-System.Length(ASubText)+1,System.Length(ASubText)),ASubText)=0);
+  Result:=(ASubText<>'') and ({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.CompareText(System.Copy(AText,System.Length(AText)-System.Length(ASubText)+1,System.Length(ASubText)),ASubText)=0);
 end;
 
 
@@ -5819,7 +5826,7 @@ end;
 
 class function TStringHelper.Format(const AFormat: string; const args: array of const): string;
 begin
-  Result:=Sysutils.Format(AFormat,Args);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format(AFormat,Args);
 end;
 
 
@@ -5831,7 +5838,7 @@ end;
 
 class function TStringHelper.IsNullOrWhiteSpace(const AValue: string): Boolean;
 begin
-  Result:=system.Length(sysutils.Trim(AValue))=0;
+  Result:=system.Length({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Trim(AValue))=0;
 end;
 
 
@@ -5867,7 +5874,7 @@ end;
 
 class function TStringHelper.LowerCase(const S: string): string;
 begin
-  Result:=sysutils.Lowercase(S);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Lowercase(S);
 end;
 
 
@@ -5927,7 +5934,7 @@ end;
 
 class function TStringHelper.UpperCase(const S: string): string;
 begin
-  Result:=sysutils.Uppercase(S);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Uppercase(S);
 end;
 
 class function TStringHelper.ToCharArray(const S: String): TCharArray;
@@ -6051,7 +6058,7 @@ end;
 function TStringHelper.Format(const args: array of const): string;
 
 begin
-  Result:=Sysutils.Format(Self,Args);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format(Self,Args);
 end;
 
 
@@ -6365,7 +6372,7 @@ end;
 function TStringHelper.IsDelimiter(const Delimiters: string; Index: SizeInt
   ): Boolean;
 begin
-  Result:=sysutils.IsDelimiter(Delimiters,Self,Index+1);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.IsDelimiter(Delimiters,Self,Index+1);
 end;
 
 
@@ -6377,7 +6384,7 @@ end;
 
 function TStringHelper.LastDelimiter(const Delims: string): SizeInt;
 begin
-  Result:=sysutils.LastDelimiter(Delims,Self)-1;
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.LastDelimiter(Delims,Self)-1;
 end;
 
 
@@ -6960,19 +6967,19 @@ end;
 
 function TStringHelper.Trim: string;
 begin
-  Result:=SysUtils.Trim(self);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Trim(self);
 end;
 
 
 function TStringHelper.TrimLeft: string;
 begin
-  Result:=SysUtils.TrimLeft(Self);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.TrimLeft(Self);
 end;
 
 
 function TStringHelper.TrimRight: string;
 begin
-  Result:=SysUtils.TrimRight(Self);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.TrimRight(Self);
 end;
 
 
@@ -7036,7 +7043,7 @@ end;
 Class Function TDoubleHelper.IsNan(const AValue: Double): Boolean; overload; inline;
 
 begin
-  Result:=JS.jsIsNaN(AValue);
+  Result:={$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.jsIsNaN(AValue);
 end;
 
 Class Function TDoubleHelper.IsInfinity(const AValue: Double): Boolean; overload; inline;

packages/rtl/timer.pas → packages/rtl/src/timer.pas

@@ -10,14 +10,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
+unit timer;
+{$ENDIF}
 
 {$mode objfpc}
 
-unit timer;
-
 Interface
 
-uses JS, Web, Classes;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.Web, System.Classes;
+{$ELSE}
+  JS, Web, Classes;
+{$ENDIF}
 
 type
   TTimer = class(TComponent)

packages/rtl/types.pas → packages/rtl/src/types.pas

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Types;
+{$ENDIF}
 
 {$mode objfpc}
 

packages/rtl/typinfo.pas → packages/rtl/src/typinfo.pas

@@ -10,7 +10,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit TypInfo;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
@@ -18,7 +20,11 @@ unit TypInfo;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, System.Types, System.RTLConsts, JSApi.JS;
+{$ELSE}  
   SysUtils, Types, RTLConsts, JS;
+{$ENDIF}
 
 type
   // TCallConv for compatibility with Delphi/FPC, ignored under pas2js

packages/rtl/web.pas → packages/rtl/src/web.pas

@@ -2,6 +2,8 @@
     This file is part of the Pas2JS run time library.
     Copyright (c) 2017-2020 by the Pas2JS development team.
 
+    Browser Window & DOM API definitions
+    
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
 
@@ -11,14 +13,20 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
+unit Web;
+{$ENDIF}
 {$mode objfpc}
 {$modeswitch externalclass}
 
-unit Web;
-
 interface
 
-uses Types, JS, weborworker;
+Uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Types, JSApi.JS, BrowserApi.WebOrWorker;
+{$ELSE FPC_DOTTEDUNITS}
+  Types, JS, weborworker;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
   // Forward definitions
@@ -46,29 +54,153 @@ Type
   TJSShowOpenFilePickerOptions = class;
   TJSShowSaveFilePickerOptions = class;
 
+{$IFDEF FPC_DOTTEDUNITS}
+  TJSServiceWorker = BrowserApi.WebOrWorker.TJSServiceWorker;
+  TJSServiceWorkerRegistration = BrowserApi.WebOrWorker.TJSServiceWorkerRegistration;
+  TJSMessageEvent = BrowserApi.WebOrWorker.TJSMessageEvent;
+  TJSEvent = BrowserApi.WebOrWorker.TJSEvent;
+  TJSBlob = BrowserApi.WebOrWorker.TJSBlob;
+  TJSEventTarget = BrowserApi.WebOrWorker.TJSEventTarget;
+  TJSEventInit = BrowserApi.WebOrWorker.TJSEventInit;
+  TJSConsole = BrowserApi.WebOrWorker.TJSConsole;
+  KeyType = BrowserApi.WebOrWorker.TJSCryptoKeyType;
+  KeyUsage = BrowserApi.WebOrWorker.TJSCryptoKeyUsage;
+  NamedCurve = BrowserApi.WebOrWorker.TJSCryptoNamedCurve;
+  BigInteger = BrowserApi.WebOrWorker.TJSCryptoBigInteger;
+  KeyFormat = BrowserApi.WebOrWorker.TJSCryptoKeyFormat;
+  Algorithm = BrowserApi.WebOrWorker.TJSCryptoAlgorithm;
+  AesCbcParams = BrowserApi.WebOrWorker.TJSCryptoAesCbcParams;
+  AesCtrParams = BrowserApi.WebOrWorker.TJSCryptoAesCtrParams;
+  AesGcmParams = BrowserApi.WebOrWorker.TJSCryptoAesGcmParams;
+  HmacImportParams = BrowserApi.WebOrWorker.TJSCryptoHmacImportParams;
+  Pbkdf2Params = BrowserApi.WebOrWorker.TJSCryptoPbkdf2Params;
+  RsaHashedImportParams = BrowserApi.WebOrWorker.TJSCryptoRsaHashedImportParams;
+  AesKeyGenParams = BrowserApi.WebOrWorker.TJSCryptoAesKeyGenParams;
+  HmacKeyGenParams = BrowserApi.WebOrWorker.TJSCryptoHmacKeyGenParams;
+  RsaHashedKeyGenParams = BrowserApi.WebOrWorker.TJSCryptoRsaHashedKeyGenParams;
+  RsaOaepParams = BrowserApi.WebOrWorker.TJSCryptoRsaOaepParams;
+  RsaPssParams = BrowserApi.WebOrWorker.TJSCryptoRsaPssParams;
+  DhKeyGenParams = BrowserApi.WebOrWorker.TJSCryptoDhKeyGenParams;
+  EcKeyGenParams = BrowserApi.WebOrWorker.TJSCryptoEcKeyGenParams;
+  AesDerivedKeyParams = BrowserApi.WebOrWorker.TJSCryptoAesDerivedKeyParams;
+  HmacDerivedKeyParams = BrowserApi.WebOrWorker.TJSCryptoHmacDerivedKeyParams;
+  EcdhKeyDeriveParams = BrowserApi.WebOrWorker.TJSCryptoEcdhKeyDeriveParams;
+  DhKeyDeriveParams = BrowserApi.WebOrWorker.TJSCryptoDhKeyDeriveParams;
+  DhImportKeyParams = BrowserApi.WebOrWorker.TJSCryptoDhImportKeyParams;
+  EcdsaParams = BrowserApi.WebOrWorker.TJSCryptoEcdsaParams;
+  EcKeyImportParams = BrowserApi.WebOrWorker.TJSCryptoEcKeyImportParams;
+  CryptoKeyPair = BrowserApi.WebOrWorker.TJSCryptoKeyPair;
+  HkdfParams = BrowserApi.WebOrWorker.TJSCryptoHkdfParams;
+  RsaOtherPrimesInfo = BrowserApi.WebOrWorker.TJSCryptoRsaOtherPrimesInfo;
+  TRsaOtherPrimesInfoDynArray = BrowserApi.WebOrWorker.TJSCryptoRsaOtherPrimesInfoDynArray;
+  TKeyUsageDynArray = BrowserApi.WebOrWorker.TJSCryptoKeyUsageDynArray;
+  TJSCryptoKey = BrowserApi.WebOrWorker.TJSCryptoKey;
+  TJSSubtleCrypto = BrowserApi.WebOrWorker.TJSSubtleCrypto;
+  TJSCrypto = BrowserApi.WebOrWorker.TJSCrypto;
+  TJSIDBTransactionMode = BrowserApi.WebOrWorker.TJSIDBTransactionMode;
+  TJSIDBTransaction = BrowserApi.WebOrWorker.TJSIDBTransaction;
+  TJSIDBKeyRange = BrowserApi.WebOrWorker.TJSIDBKeyRange;
+  TJSIDBIndexParameters = BrowserApi.WebOrWorker.TJSIDBIndexParameters;
+  TJSIDBIndex = BrowserApi.WebOrWorker.TJSIDBIndex;
+  TJSIDBCursorDirection = BrowserApi.WebOrWorker.TJSIDBCursorDirection;
+  TJSIDBCursor = BrowserApi.WebOrWorker.TJSIDBCursor;
+  TJSIDBObjectStore = BrowserApi.WebOrWorker.TJSIDBObjectStore;
+  TJSIDBRequest = BrowserApi.WebOrWorker.TJSIDBRequest;
+  TJSIDBOpenDBRequest = BrowserApi.WebOrWorker.TJSIDBOpenDBRequest;
+  TJSCreateObjectStoreOptions = BrowserApi.WebOrWorker.TJSCreateObjectStoreOptions;
+  TIDBDatabase = BrowserApi.WebOrWorker.TIDBDatabase;
+  TJSIDBFactory = BrowserApi.WebOrWorker.TJSIDBFactory;
+  TJSWorker = BrowserApi.WebOrWorker.TJSWorker;
+  TJSExtendableEvent = BrowserApi.WebOrWorker.TJSExtendableEvent;
+  TJSClient = BrowserApi.WebOrWorker.TJSClient;
+  TJSExtendableMessageEvent = BrowserApi.WebOrWorker.TJSExtendableMessageEvent;
+  TJSURLSearchParams = BrowserApi.WebOrWorker.TJSURLSearchParams;
+  TJSURL = BrowserApi.WebOrWorker.TJSURL;
+  TJSURLDynArray = BrowserApi.WebOrWorker.TJSURLDynArray;
+  TJSTimerCallBack = BrowserApi.WebOrWorker.TJSTimerCallBack;
+  TJSReadableStream = BrowserApi.WebOrWorker.TJSReadableStream;
+  TJSWritableStream = BrowserApi.WebOrWorker.TJSWritableStream;
+  TJSBody = BrowserApi.WebOrWorker.TJSBody;
+  TJSResponse = BrowserApi.WebOrWorker.TJSResponse;
+  TJSCache = BrowserApi.WebOrWorker.TJSCache;
+  TJSCacheStorage = BrowserApi.WebOrWorker.TJSCacheStorage;
+{$ELSE}
   TJSServiceWorker = weborworker.TJSServiceWorker;
   TJSServiceWorkerRegistration = weborworker.TJSServiceWorkerRegistration;
   TJSMessageEvent = weborworker.TJSMessageEvent;
-  TJSMessagePortArray = TJSMessagePortDynArray;
-
-  { TEventListenerEvent }
-
-(*
-TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
-  private
-    FTarget: TJSEventTarget; external name 'target';
-  public
-    Property target: TJSEventTarget Read FTarget;
-  end;
-*)
   TJSEvent = weborworker.TJSEvent;
-  TEventListenerEvent = TJSEvent;
   TJSBlob = weborworker.TJSBlob;
+  TJSEventTarget = weborworker.TJSEventTarget;
+  TJSEventInit = weborworker.TJSEventInit;
+  TJSConsole = weborworker.TJSConsole;
+  KeyType = weborworker.TJSCryptoKeyType;
+  KeyUsage = weborworker.TJSCryptoKeyUsage;
+  NamedCurve = weborworker.TJSCryptoNamedCurve;
+  BigInteger = weborworker.TJSCryptoBigInteger;
+  KeyFormat = weborworker.TJSCryptoKeyFormat;
+  Algorithm = weborworker.TJSCryptoAlgorithm;
+  AesCbcParams = weborworker.TJSCryptoAesCbcParams;
+  AesCtrParams = weborworker.TJSCryptoAesCtrParams;
+  AesGcmParams = weborworker.TJSCryptoAesGcmParams;
+  HmacImportParams = weborworker.TJSCryptoHmacImportParams;
+  Pbkdf2Params = weborworker.TJSCryptoPbkdf2Params;
+  RsaHashedImportParams = weborworker.TJSCryptoRsaHashedImportParams;
+  AesKeyGenParams = weborworker.TJSCryptoAesKeyGenParams;
+  HmacKeyGenParams = weborworker.TJSCryptoHmacKeyGenParams;
+  RsaHashedKeyGenParams = weborworker.TJSCryptoRsaHashedKeyGenParams;
+  RsaOaepParams = weborworker.TJSCryptoRsaOaepParams;
+  RsaPssParams = weborworker.TJSCryptoRsaPssParams;
+  DhKeyGenParams = weborworker.TJSCryptoDhKeyGenParams;
+  EcKeyGenParams = weborworker.TJSCryptoEcKeyGenParams;
+  AesDerivedKeyParams = weborworker.TJSCryptoAesDerivedKeyParams;
+  HmacDerivedKeyParams = weborworker.TJSCryptoHmacDerivedKeyParams;
+  EcdhKeyDeriveParams = weborworker.TJSCryptoEcdhKeyDeriveParams;
+  DhKeyDeriveParams = weborworker.TJSCryptoDhKeyDeriveParams;
+  DhImportKeyParams = weborworker.TJSCryptoDhImportKeyParams;
+  EcdsaParams = weborworker.TJSCryptoEcdsaParams;
+  EcKeyImportParams = weborworker.TJSCryptoEcKeyImportParams;
+  CryptoKeyPair = weborworker.TJSCryptoKeyPair;
+  HkdfParams = weborworker.TJSCryptoHkdfParams;
+  RsaOtherPrimesInfo = weborworker.TJSCryptoRsaOtherPrimesInfo;
+  TRsaOtherPrimesInfoDynArray = weborworker.TJSCryptoRsaOtherPrimesInfoDynArray;
+  TKeyUsageDynArray = weborworker.TJSCryptoKeyUsageDynArray;
+  TJSCryptoKey = weborworker.TJSCryptoKey;
+  TJSSubtleCrypto = weborworker.TJSSubtleCrypto;
+  TJSCrypto = weborworker.TJSCrypto;
+  TJSIDBTransactionMode = weborworker.TJSIDBTransactionMode;
+  TJSIDBTransaction = weborworker.TJSIDBTransaction;
+  TJSIDBKeyRange = weborworker.TJSIDBKeyRange;
+  TJSIDBIndexParameters = weborworker.TJSIDBIndexParameters;
+  TJSIDBIndex = weborworker.TJSIDBIndex;
+  TJSIDBCursorDirection = weborworker.TJSIDBCursorDirection;
+  TJSIDBCursor = weborworker.TJSIDBCursor;
+  TJSIDBObjectStore = weborworker.TJSIDBObjectStore;
+  TJSIDBRequest = weborworker.TJSIDBRequest;
+  TJSIDBOpenDBRequest = weborworker.TJSIDBOpenDBRequest;
+  TJSCreateObjectStoreOptions = weborworker.TJSCreateObjectStoreOptions;
+  TIDBDatabase = weborworker.TIDBDatabase;
+  TJSIDBFactory = weborworker.TJSIDBFactory;
+  TJSWorker = weborworker.TJSWorker;
+  TJSExtendableEvent = weborworker.TJSExtendableEvent;
+  TJSClient = weborworker.TJSClient;
+  TJSExtendableMessageEvent = weborworker.TJSExtendableMessageEvent;
+  TJSURLSearchParams = weborworker.TJSURLSearchParams;
+  TJSURL = weborworker.TJSURL;
+  TJSURLDynArray = weborworker.TJSURLDynArray;
+  TJSTimerCallBack = weborworker.TJSTimerCallBack;
+  TJSReadableStream = weborworker.TJSReadableStream;
+  TJSWritableStream = weborworker.TJSWritableStream;
+  TJSBody = weborworker.TJSBody;
+  TJSResponse = weborworker.TJSResponse;
+  TJSCache = weborworker.TJSCache;
+  TJSCacheStorage = weborworker.TJSCacheStorage;
+{$ENDIF}
+  TJSMessagePortArray = TJSMessagePortDynArray;
+  TEventListenerEvent = TJSEvent;
 
   TJSEventHandler = reference to function(Event: TEventListenerEvent): boolean; safecall;
   TJSRawEventHandler = reference to Procedure(Event: TJSEvent); safecall;
 
-  TJSEventTarget = weborworker.TJSEventTarget;
 
   TJSNode = class external name 'Node' (TJSEventTarget)
   Private
@@ -430,7 +562,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
     property lastElementChild : TJSElement read FlastElementChild;
   end;
 
-  TJSEventInit = weborworker.TJSEventInit;
 
   { TJSEventHelper }
 
@@ -1018,53 +1149,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
     property visibilityState : string read FVisibilityState;
   end;
 
-  TJSConsole = weborworker.TJSConsole;
-
-//  TJSBufferSource = class external name 'BufferSource' end;
-//  TJSTypedArray = class external name 'TypedArray' end;
-
-  // Forward class definitions
-  KeyType = weborworker.TJSCryptoKeyType;
-  KeyUsage = weborworker.TJSCryptoKeyUsage;
-
-  NamedCurve = weborworker.TJSCryptoNamedCurve;
-  BigInteger = weborworker.TJSCryptoBigInteger;
-
-  KeyFormat = weborworker.TJSCryptoKeyFormat;
-  // Union of object, DOMString
-
-
-  Algorithm = weborworker.TJSCryptoAlgorithm;
-  AesCbcParams = weborworker.TJSCryptoAesCbcParams;
-  AesCtrParams = weborworker.TJSCryptoAesCtrParams;
-  AesGcmParams = weborworker.TJSCryptoAesGcmParams;
-  HmacImportParams = weborworker.TJSCryptoHmacImportParams;
-  Pbkdf2Params = weborworker.TJSCryptoPbkdf2Params;
-  RsaHashedImportParams = weborworker.TJSCryptoRsaHashedImportParams;
-  AesKeyGenParams = weborworker.TJSCryptoAesKeyGenParams;
-  HmacKeyGenParams = weborworker.TJSCryptoHmacKeyGenParams;
-  RsaHashedKeyGenParams = weborworker.TJSCryptoRsaHashedKeyGenParams;
-  RsaOaepParams = weborworker.TJSCryptoRsaOaepParams;
-  RsaPssParams = weborworker.TJSCryptoRsaPssParams;
-  DhKeyGenParams = weborworker.TJSCryptoDhKeyGenParams;
-  EcKeyGenParams = weborworker.TJSCryptoEcKeyGenParams;
-  AesDerivedKeyParams = weborworker.TJSCryptoAesDerivedKeyParams;
-  HmacDerivedKeyParams = weborworker.TJSCryptoHmacDerivedKeyParams;
-  EcdhKeyDeriveParams = weborworker.TJSCryptoEcdhKeyDeriveParams;
-  DhKeyDeriveParams = weborworker.TJSCryptoDhKeyDeriveParams;
-  DhImportKeyParams = weborworker.TJSCryptoDhImportKeyParams;
-
-  EcdsaParams = weborworker.TJSCryptoEcdsaParams;
-  EcKeyImportParams = weborworker.TJSCryptoEcKeyImportParams;
-
-  CryptoKeyPair = weborworker.TJSCryptoKeyPair;
-  HkdfParams = weborworker.TJSCryptoHkdfParams;
-  RsaOtherPrimesInfo = weborworker.TJSCryptoRsaOtherPrimesInfo;
-  TRsaOtherPrimesInfoDynArray = weborworker.TJSCryptoRsaOtherPrimesInfoDynArray;
-  TKeyUsageDynArray = weborworker.TJSCryptoKeyUsageDynArray;
-  TJSCryptoKey = weborworker.TJSCryptoKey;
-  TJSSubtleCrypto = weborworker.TJSSubtleCrypto;
-  TJSCrypto = weborworker.TJSCrypto;
 
   { TJSHistory }
 
@@ -1090,21 +1174,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
     property length: NativeInt read FLength;
   end;
 
-  { IndexedDB - moved to weborworker}
-
-  TJSIDBTransactionMode = weborworker.TJSIDBTransactionMode;
-  TJSIDBTransaction = weborworker.TJSIDBTransaction;
-  TJSIDBKeyRange = weborworker.TJSIDBKeyRange;
-  TJSIDBIndexParameters = weborworker.TJSIDBIndexParameters;
-  TJSIDBIndex = weborworker.TJSIDBIndex;
-  TJSIDBCursorDirection = weborworker.TJSIDBCursorDirection;
-  TJSIDBCursor = weborworker.TJSIDBCursor;
-  TJSIDBObjectStore = weborworker.TJSIDBObjectStore;
-  TJSIDBRequest = weborworker.TJSIDBRequest;
-  TJSIDBOpenDBRequest = weborworker.TJSIDBOpenDBRequest;
-  TJSCreateObjectStoreOptions = weborworker.TJSCreateObjectStoreOptions;
-  TIDBDatabase = weborworker.TIDBDatabase;
-  TJSIDBFactory = weborworker.TJSIDBFactory;
 
   { TJSStorage }
 
@@ -1184,7 +1253,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
   TJSMediaDevices = class external name 'MediaDevices' (TJSEventTarget)
   end;
 
-  TJSWorker = weborworker.TJSWorker;
 
 
   { TJSSharedWorker }
@@ -1198,9 +1266,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
     property port : TJSMessagePort Read FPort;
   end;
 
-  TJSExtendableEvent = weborworker.TJSExtendableEvent;
-  TJSClient = weborworker.TJSClient;
-  TJSExtendableMessageEvent = weborworker.TJSExtendableMessageEvent;
 
   TJSServiceWorkerContainerOptions = record
     scope : string;
@@ -1346,12 +1411,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
 
 
 
-  TJSURLSearchParams = weborworker.TJSURLSearchParams;
-  TJSURL = weborworker.TJSURL;
-  TJSURLDynArray = weborworker.TJSURLDynArray;
-
-
-  TJSTimerCallBack = weborworker.TJSTimerCallBack;
 
 
   { TJSMediaQueryList }
@@ -1365,11 +1424,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
     Property media : String Read FMedia;
   end;
 
-  TJSReadableStream = weborworker.TJSReadableStream;
-  TJSWritableStream = weborworker.TJSWritableStream;
-  TJSBody = weborworker.TJSBody;
-
-  TJSResponse = weborworker.TJSResponse;
 
   TJSDOMHighResTimeStamp = Double;
   TFrameRequestCallback = reference to procedure (aTime: TJSDOMHighResTimeStamp);
@@ -1393,8 +1447,6 @@ TEventListenerEvent = class external name 'EventListener_Event' (TJSObject)
     property didTimeout: Boolean read FDidTimeout;
   end;
 
-  TJSCache = weborworker.TJSCache;
-  TJSCacheStorage = weborworker.TJSCacheStorage;
 
   TJSWindowArray = Array of TJSWindow;
   TIdleCallbackProc = reference to procedure(idleDeadline: TJSIdleDeadline);

packages/rtl/webassembly.pas → packages/rtl/src/webassembly.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser WebAssembly API definitions
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit webassembly;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
@@ -6,7 +23,11 @@ unit webassembly;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS;
+{$ELSE}
   js;
+{$ENDIF}  
 
 Type
   { TJSWebAssemblyMemory }

packages/rtl/webaudio.pas → packages/rtl/src/webaudio.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser Audio API definitions.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit webaudio;
+{$ENDIF}
 
 {$MODE ObjFPC}
 {$H+}
@@ -6,7 +23,12 @@ Unit webaudio;
 
 interface
 
-uses SysUtils, JS, weborworker, web, types;
+uses 
+{$IFDEF FPC_DOTTEDAPI}
+  System.SysUtils, JSApi.JS, BrowserApi.WebOrWorker, BrowserApi.Web, System.Types;
+{$ELSE}
+  SysUtils, JS, weborworker, web, types;
+{$ENDIF}
 
 {
   Automatically generated file by TWebIDLToPas on 2018-06-23 10:52:00

packages/rtl/webbluetooth.pas → packages/rtl/src/webbluetooth.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser BlueTooth API definitions
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit webbluetooth;
+{$ENDIF}
 
 {$MODE ObjFPC}
 {$H+}
@@ -6,7 +23,12 @@ Unit webbluetooth;
 
 interface
 
-uses JS,web;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.Web;
+{$ELSE}
+  JS, Web;
+{$ENDIF}
 
 Type
   // Forward class definitions

packages/rtl/webgl.pas → packages/rtl/src/webgl.pas

@@ -1,4 +1,20 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser WebGL API definitions.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit webgl;
+{$ENDIF}
 
 {$MODE ObjFPC}
 {$H+}
@@ -6,7 +22,12 @@ Unit webgl;
 
 interface
 
-uses JS, Web;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.Web;
+{$ELSE}
+JS, Web;
+{$ENDIF}
 
 {
   Automatically generated file by TWebIDLToPas on 2018-06-23 15:31:57

packages/rtl/weborworker.pas → packages/rtl/src/weborworker.pas

@@ -1,4 +1,21 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser Worker and Window API definitions
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
 unit weborworker;
+{$ENDIF}
 
 {$mode objfpc}
 {$modeswitch externalclass}
@@ -6,7 +23,11 @@ unit weborworker;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, System.Types;
+{$ELSE}
   JS, types;
+{$ENDIF}
 
 type
   // Forward declarations

packages/rtl/webrouter.pp → packages/rtl/src/webrouter.pp

@@ -16,16 +16,24 @@
   Note:
   The MatchPattern routine was taken from Brook Framework's router unit, by Silvio Clecio.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
+unit webrouter;
+{$ENDIF}
+
+{$MODE OBJFPC}
+{$WARN 4501 off}
 
-{$mode objfpc}
 // Define this to output some debugging output
 { $DEFINE DEBUGROUTER }
-unit webrouter;
-{$WARN 4501 off : }
+
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Classes, System.SysUtils, BrowserApi.Web;
+{$ELSE}  
   Classes, SysUtils, web;
+{$ENDIF}
 
 Type
   EHTTPRoute = Class(Exception);
@@ -319,7 +327,12 @@ Function IncludeHTTPPathDelimiter (S : String) : String;
 
 implementation
 
-uses strutils, js;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.StrUtils, JSApi.JS;
+{$ELSE}  
+  strutils,js;
+{$ENDIF}  
 
 Resourcestring
   EDuplicateRoute = 'Duplicate route pattern: %s';

packages/rtl/webrtc.pas → packages/rtl/src/webrtc.pas

@@ -1,4 +1,20 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser RTC (Real-Time Communications) API definitions
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit webrtc;
+{$ENDIF}
 
 {$MODE ObjFPC}
 {$H+}
@@ -6,7 +22,12 @@ Unit webrtc;
 
 interface
 
-uses SysUtils, JS,web;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, JSApi.JS, BrowserApi.WebOrWorker, BrowserApi.Web;
+{$ELSE}
+  SysUtils, JS, weborworker, web;
+{$ENDIF}
 
 {
   Automatically generated file by TWebIDLToPas on 2020-03-23 14:48:13
@@ -524,7 +545,7 @@ Type
     function createOffer(successCallback : RTCSessionDescriptionCallback; failureCallback : RTCPeerConnectionErrorCallback): TJSPromise; overload;
     function createAnswer(successCallback : RTCSessionDescriptionCallback; failureCallback : RTCPeerConnectionErrorCallback): TJSPromise;
     function addIceCandidate(candidate : TJSRTCIceCandidateInit; successCallback : TProcedure; failureCallback : RTCPeerConnectionErrorCallback): TJSPromise;
-    function generateCertificate(keygenAlgorithm : AlgorithmIdentifier): TJSPromise;
+    function generateCertificate(keygenAlgorithm : TJSCryptoAlgorithmIdentifier): TJSPromise;
     function getSenders: TTJSRTCRtpSenderDynArray;
     function getReceivers: TTJSRTCRtpReceiverDynArray;
     function getTransceivers: TTJSRTCRtpTransceiverDynArray;

packages/rtl/websvg.pas → packages/rtl/src/websvg.pas

@@ -1,4 +1,20 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser SVG API definitions.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit websvg;
+{$ENDIF}
 
 {$MODE ObjFPC}
 {$H+}
@@ -6,7 +22,12 @@ unit websvg;
 
 interface
 
-uses SysUtils, web, JS;
+uses 
+{$IFDEF FPC_DOTTEDUNITS}
+  System.SysUtils, BrowserApi.Web, JSApi.JS;
+{$ELSE}
+  SysUtils, web, JS;
+{$ENDIF}
 
 type
   // Forward class

packages/rtl/src/webutils.pas

@@ -0,0 +1,51 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Utility routines for in the browser. Deprecated.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+{$IFNDEF FPC_DOTTEDUNITS}
+unit webutils deprecated 'Use rtl.HTMLUtils';
+{$ENDIF}
+
+{$mode objfpc}
+
+interface
+
+uses
+{$IFDEF FPC_DOTTEDUNITS}
+  BrowserApi.Web, JSApi.JS;
+{$ELSE}
+  web, js;
+{$ENDIF}  
+
+function AsyncSleep(ms: NativeInt): TJSPromise deprecated 'Use HTML.Utils.AsyncSleep';
+
+implementation
+
+function AsyncSleep(ms: NativeInt): TJSPromise;
+
+begin
+  Result := TJSPromise.New(
+  procedure(resolve,reject : TJSPromiseResolver)
+  begin
+    window.setTimeout(
+    procedure()
+    begin
+      resolve(ms);
+    end,
+    ms);
+  end);
+end;
+
+end.
+

packages/rtl/webworker.pas → packages/rtl/src/webworker.pas

@@ -1,4 +1,20 @@
+{
+    This file is part of the Pas2JS run time library.
+    Copyright (c) 2022 by Michael Van Canneyt
+    
+    Browser WebWorker API definitions.
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit webworker;
+{$ENDIF}
 
 {$mode ObjFPC}
 {$modeswitch externalclass}
@@ -6,7 +22,11 @@ unit webworker;
 interface
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  JSApi.JS, BrowserApi.WebOrWorker;
+{$ELSE}
   JS, weborworker;
+{$ENDIF}
 
 Type
 

packages/rtl/webutils.pas

@@ -1,30 +0,0 @@
-unit webutils deprecated 'Use rtl.HTMLUtils';
-
-{$mode objfpc}
-
-interface
-
-uses
-  web, js;
-
-function AsyncSleep(ms: NativeInt): TJSPromise deprecated 'Use rtl.HTMLUtils.AsyncSleep';
-
-implementation
-
-function AsyncSleep(ms: NativeInt): TJSPromise;
-
-begin
-  Result := TJSPromise.New(
-  procedure(resolve,reject : TJSPromiseResolver)
-  begin
-    window.setTimeout(
-    procedure()
-    begin
-      resolve(ms);
-    end,
-    ms);
-  end);
-end;
-
-end.
-