update revision

Author: lidangzzz

packages/hedgehog-core/package.json

@@ -21,6 +21,7 @@
     "dependencies": {
         "@babel/core": "^7.10.5",
         "@babel/preset-env": "^7.10.4",
+        "@babel/preset-react": "^7.12.10",
         "@babel/preset-typescript": "^7.10.4",
         "@babel/standalone": "^7.10.5",
         "@tensorflow/tfjs": "^2.7.0",

packages/hedgehog-core/src/runtime/prelude.ts

@@ -9,6 +9,9 @@ import { Chol, QR, LU } from '../lib/algebra';
 import { OutputItem } from '../output/output-item';
 import { rawInputsToTex } from '../utilites/process-raw-inputs';
 
+import * as React from 'react';
+import * as d3 from 'd3';
+
 /*
 Third party libraries
 */
@@ -34,7 +37,7 @@ import * as tf from '@tensorflow/tfjs';
 //tvm.js
 
 
-export { Sym, Mat, Scalar, _Mat, nerdamer, GPU, mathjs, tf, Chol };
+export { Sym, Mat, Scalar, _Mat, nerdamer, GPU, mathjs, tf, Chol, React, d3 };
 
 /**
  * wrapper of constructing a Mat object
@@ -371,6 +374,7 @@ export function plot3DMesh(x_: any, y_: any, z_: any) {
       ],
       {}
     );
+    return;
   }
   draw(
     [
@@ -399,7 +403,8 @@ export function formulaTex(...inputs: any[]) {
   _OUTPUT_ITEMS_LIST_.push({ itemType: 'FORMULA', text: inputTex });
 }
 
-export function markdown(inputMarkdown: string) {
+export function markdown(...inputs: any[]) {
+  const inputMarkdown: string = rawInputsToTex(...inputs);
   _OUTPUT_ITEMS_LIST_.push({ itemType: 'MARKDOWN', text: inputMarkdown });
 }
 

packages/hedgehog-core/src/transpiler/operator-overload.ts

@@ -19,7 +19,7 @@ function invokedTemplate(op: any) {
         return (sym(LEFT_ARG)[Symbol.for("${op}")](RIGHT_ARG));
       else if (Array.isArray(LEFT_ARG) && (RIGHT_ARG instanceof Mat))
         return (mat(LEFT_ARG)[Symbol.for("${op}")](RIGHT_ARG));
-      else if ( typeof LEFT_ARG === 'number' && (RIGHT_ARG instanceof Mat))
+      else if (  (!isNaN(LEFT_ARG)) && (RIGHT_ARG instanceof Mat))
         return (scalar(LEFT_ARG)[Symbol.for("${op}")](RIGHT_ARG));
       else
         return LEFT_ARG ${op} RIGHT_ARG;

packages/hedgehog-core/src/transpiler/preprocessor.ts

@@ -37,12 +37,13 @@ function getPackageLocation(packageName: string, theFullListInJson: string): str
 
 /*
 Parse the registered package (the type 1 of import macro: *import PACKAGE_NAME: LIB_NAME_LIST)
-Input: the second part of current line splitted by "*import". For example, current line is "*import std:magic, cholesky",
+Input: secondPart: the second part of current line splitted by "*import". For example, current line is "*import std:magic, cholesky",
        then the input will be "std:magic, cholesky"; if current line is "let myMagic = *import std:magic", then the input should 
        be "std:magic, cholesky"
+       strCurrentCallStack: current call stack
 Output: A list of string, each string represents the corresponding hhs source file
 */
-async function parseRegisterdPackage(secondPart: string): Promise<Array<string>> {
+async function parseRegisterdPackage(secondPart: string, strCurrentCallStack:string): Promise<Array<string>> {
   let returnListOfFunctions: string[] = [];
   let theFullListInJson = await fetch("https://raw.githubusercontent.com/Hedgehog-Computing/Hedgehog-Package-Manager/main/hedgehog-packages.json", { method: 'get' }).then(body => body.text());
   let splittedResult = secondPart.split(':');
@@ -72,11 +73,15 @@ async function parseRegisterdPackage(secondPart: string): Promise<Array<string>>
       if (setHHSCompleteList.has(eachItemWithoutSpace)) {
         let currentHHSLocation = packageLocation + eachItemWithoutSpace + ".hhs";
         let currentItemSourceCode = await fetch(currentHHSLocation, { method: 'get' }).then(body => body.text());
-        returnListOfFunctions.push(currentItemSourceCode);
+
+        // After get the whole hhs source file, preprocess the string via DFS preprocessor
+        // to handle the dependencies of current source file string
+        let preprocessedCurrentItemSourceCode = await preprocessDFS(currentItemSourceCode, strCurrentCallStack + " -> " + strCurrentCallStack + ":" + eachItemWithoutSpace);
+        returnListOfFunctions.push(preprocessedCurrentItemSourceCode);
       }
     }
   }
-  else { throw "Cannot find \"includes\" key in the hedgehog-package.json configuration file! Please add a key with name \"includes\" with a complete list of exported libraries. Exception at " +  secondPart}
+  else { throw "Cannot find \"includes\" key in the hedgehog-package.json configuration file! Please add a key with name \"includes\" with a complete list of exported libraries. Exception at " +  secondPart + ".\nCall Stack at: " + strCurrentCallStack}
   return returnListOfFunctions;
 }
 
@@ -136,7 +141,7 @@ async function preprocessDFS(code: string, strCurrentCallStack: string): Promise
 
         else{
           // otherwise, try to split with colon and comma and fetch the registered packages
-          let result = await parseRegisterdPackage(splittedResult[1]);
+          let result = await parseRegisterdPackage(splittedResult[1], strCurrentCallStack);
           let combined_result = "";
           result.forEach(element => {
             combined_result += element + "\n"

packages/hedgehog-core/src/transpiler/transpiler-core.ts

@@ -11,6 +11,9 @@ async function transpilerCore(source: string) {
   //register preset-env
   babel.registerPreset('@babel/preset-env', require('@babel/preset-env'));
 
+  //register jsx preset
+  babel.registerPreset('@babel/preset-react', require('@babel/preset-react'));
+
   //register typescript preset
   babel.registerPreset(
     '@babel/preset-typescript',
@@ -23,8 +26,8 @@ async function transpilerCore(source: string) {
     preprocessed_code, // the code
     {
       plugins: ['overload'],
-      presets: ['@babel/preset-env', '@babel/preset-typescript'],
-      filename: 'temp.js',
+      presets: ['@babel/preset-env', '@babel/preset-typescript', '@babel/preset-react'],
+      filename: 'source.tsx',
       sourceType: 'script',
     }
   );