Update And Fix FPC Demo

Update the eval_buf function to detect modules automaticaly.
Fix a big in argc and argv.
Will update Delphi Demo later :D

Author: Coldzer0

.gitignore

@@ -1,31 +1,3 @@
-# Uncomment these types if you want even more clean repository. But be careful.
-# It can make harm to an existing project source. Read explanations below.
-#
-# Resource files are binaries containing manifest, project icon and version info.
-# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files.
-#*.res
-#
-# Type library file (binary). In old Delphi versions it should be stored.
-# Since Delphi 2009 it is produced from .ridl file and can safely be ignored.
-#*.tlb
-#
-# Diagram Portfolio file. Used by the diagram editor up to Delphi 7.
-# Uncomment this if you are not using diagrams or use newer Delphi version.
-#*.ddp
-#
-# Visual LiveBindings file. Added in Delphi XE2.
-# Uncomment this if you are not using LiveBindings Designer.
-#*.vlb
-#
-# Deployment Manager configuration file for your project. Added in Delphi XE2.
-# Uncomment this if it is not mobile development and you do not use remote debug feature.
-#*.deployproj
-# 
-# C++ object files produced when C/C++ Output file generation is configured.
-# Uncomment this if you are not using external objects (zlib library for example).
-#*.obj
-#
-
 # Delphi compiler-generated binaries (safe to delete)
 *.exe
 *.bpl

QJSPascalDemo/Demo.lpr

@@ -19,22 +19,41 @@
   QuickJSDemo,RawExecution;
 
 
-function eval_buf(ctx : JSContext; Buf : PChar; buf_len : Integer; filename : PChar; eval_flags : Integer): Integer;
+function eval_buf(ctx: JSContext; Buf: PChar; buf_len: integer;
+  filename: PChar; is_main : boolean; eval_flags: integer = -1): JSValue;
 var
-  val : JSValue;
+  ret: JSValue;
 begin
-  val := JS_Eval(ctx, buf, buf_len, filename, eval_flags);
-  if JS_IsException(val) then
+  if eval_flags = -1 then
+  begin
+    if JS_DetectModule(Buf,buf_len) then
+      eval_flags := JS_EVAL_TYPE_MODULE
+    else
+      eval_flags := JS_EVAL_TYPE_GLOBAL;
+  end;
+
+  if (eval_flags and JS_EVAL_TYPE_MASK) = JS_EVAL_TYPE_MODULE then
+  begin
+    ret := JS_Eval(ctx, buf, buf_len, filename, eval_flags or JS_EVAL_FLAG_COMPILE_ONLY);
+    if not JS_IsException(ret) then
+    begin
+      js_module_set_import_meta(ctx, ret, True, is_main);
+      ret := JS_EvalFunction(ctx, ret);
+    end;
+  end
+  else
+    ret := JS_Eval(ctx, buf, buf_len, filename, eval_flags);
+
+  if JS_IsException(ret) then
   begin
     js_std_dump_error(ctx);
-    Result := -1;
+    Result := JS_NULL;
   end
   else
-    Result := 0;
-    JS_FreeValue(ctx, val);
+    Result := ret;
 end;
 
-function eval_file(ctx : JSContext; filename : PChar; eval_flags : Integer): Integer;
+function eval_file(ctx : JSContext; filename : PChar; eval_flags : Integer = -1): JSValue;
 var
   buf_len : size_t;
   Buf : Pointer;
@@ -43,9 +62,9 @@ function eval_file(ctx : JSContext; filename : PChar; eval_flags : Integer): Int
   if not Assigned(buf) then
   begin
     Writeln('Error While Loading : ',filename);
-    exit(1);
+    exit(JS_EXCEPTION);
   end;
-  Result := eval_buf(ctx, buf, buf_len, filename, eval_flags);
+  Result := eval_buf(ctx, buf, buf_len, filename, true, eval_flags);
   js_free(ctx, buf);
 end;
 
@@ -94,7 +113,7 @@ procedure RunCode();
       // ES6 Module loader.
       JS_SetModuleLoaderFunc(rt, nil, @js_module_loader, nil);
 
-      js_std_add_helpers(ctx,argc,argv);
+      js_std_add_helpers(ctx,argc-1,@argv[1]);
       js_init_module_std(ctx, 'std');
       js_init_module_os(ctx, 'os');
 
@@ -111,7 +130,7 @@ procedure RunCode();
       m := JS_NewCModule(ctx, 'Cmu', @Emu_init);
       JS_AddModuleExport(ctx,m,'ApiHook');
 
-      eval_buf(ctx, std_hepler, strlen(std_hepler), '<global_helper>', JS_EVAL_TYPE_MODULE);
+      eval_buf(ctx, std_hepler, strlen(std_hepler), '<global_helper>', False, JS_EVAL_TYPE_MODULE);
 
 
       global := JS_GetGlobalObject(ctx);
@@ -124,7 +143,7 @@ procedure RunCode();
       if ParamCount >= 1 then
       begin
         filename := PChar(ParamStr(1));
-        eval_file(ctx,filename,JS_EVAL_TYPE_GLOBAL {or JS_EVAL_TYPE_MODULE});
+        eval_file(ctx,filename);
       end;
 
       js_std_loop(ctx);
@@ -140,6 +159,7 @@ procedure RunCode();
 
 
 begin
+  { TODO -oColdzer0 : RawTest Bytes need to be updated }
   //RawTest; // If you unComment this comment the next line.
   RunCode;
 end.

QJSPascalDemo/Demo.lps

@@ -89,7 +89,7 @@ procedure RegisterNativeClass(ctx : JSContext); cdecl;
   JS_NewClass(JS_GetRuntime(ctx),API_Class_id,@JClass);
 
   // Properties list.
-  tab[0] := JS_CFUNC_DEF('install', 1, JSCFunctionType(@install));
+  tab[0] := JS_CFUNC_DEF('install', 1, install);
   tab[1] := JS_PROP_INT32_DEF('version', 1337, JS_PROP_CONFIGURABLE);// add "or JS_PROP_WRITABLE" to make it writable.
 
   // New Object act as Prototype for the Class.