Merge pull request #50 from fullstackedorg/typescript

TypeScript

build.ts

@@ -5,6 +5,29 @@ import { build, merge } from "./platform/node/src/build";
 import { scan } from "./editor/api/projects/scan";
 import esbuild from "esbuild";
 import zip from "./editor/api/projects/zip";
+import child_process from "child_process";
+
+// TypeScript fix for JSC (Safari/WebKit) memory leak
+// Refer to this for more info: https://github.com/microsoft/TypeScript/issues/58137
+// Remove if ever fixed
+const codeToLookup = "program = createProgram(options);";
+const codeToAdd = "options.oldProgram = undefined;";
+const tsFilePath = "node_modules/typescript/lib/typescript.js";
+const tsFileContent = fs.readFileSync(tsFilePath, { encoding: "utf-8" });
+const re = new RegExp(
+    `${codeToLookup.replace(/(\(|\))/g, (c) => (c === "(" ? "\\(" : "\\)"))}(${codeToAdd})*`
+);
+const textBlockToUpdate = tsFileContent.match(re);
+if (textBlockToUpdate) {
+    if (!textBlockToUpdate[0].endsWith(codeToAdd)) {
+        fs.writeFileSync(
+            tsFilePath,
+            tsFileContent.replace(re, codeToLookup + codeToAdd)
+        );
+    }
+} else {
+    throw "Could not find typescript code block to patch.";
+}
 
 const baseFile = "src/js/index.js";
 
@@ -29,29 +52,34 @@ const compileScss = async (scssFile: string) => {
 const compilePromises = scssFiles.map(compileScss);
 await Promise.all(compilePromises);
 
-const editorEntry = await merge(
-    baseFile,
-    path.resolve("editor/index.ts"),
-    ".cache"
-);
-const buildErrors = build(
-    esbuild.buildSync,
-    editorEntry,
-    "index",
-    "editor/build",
-    undefined,
-    false,
-    false
-);
-fs.rmSync(editorEntry);
+const toBuild = [
+    ["editor/index.ts", "index"],
+    ["editor/typescript/worker.ts", "worker-ts"]
+];
+
+let buildErrors = [];
+for (const [input, output] of toBuild) {
+    const editorEntry = await merge(baseFile, path.resolve(input), ".cache");
+    const errors = build(
+        esbuild.buildSync,
+        editorEntry,
+        output,
+        "editor/build",
+        undefined,
+        "external",
+        false
+    );
+    fs.rmSync(editorEntry);
+    if (errors) buildErrors.push(errors);
+}
 
 // cleanup
 scssFiles.forEach((scssFile) => {
     const cssFile = scssFile.slice(0, -4) + "css";
     if (fs.existsSync(cssFile)) fs.rmSync(cssFile);
 });
 
-if (buildErrors) throw buildErrors;
+if (buildErrors.length) throw buildErrors;
 
 fs.cpSync("editor/index.html", "editor/build/index.html");
 fs.cpSync("editor/assets", "editor/build/assets", {
@@ -68,3 +96,14 @@ if (fs.existsSync(sampleDemoDir)) {
     );
     await fs.promises.writeFile("editor/build/Demo.zip", zipData);
 }
+
+fs.cpSync("node_modules/typescript/lib", "editor/build/tsLib", {
+    recursive: true
+});
+
+child_process.execSync(
+    "tsc --declaration --skipLibCheck --module system --outfile editor/build/tsLib/fullstacked.js src/adapter/fullstacked.ts",
+    {
+        stdio: "inherit"
+    }
+);

editor/api/git/index.ts

@@ -275,10 +275,7 @@ export default {
                 onAuth: requestGitAuth
             });
         } catch (e) {
-            // unreacheable
-            if (e.cause?.code == "ENOTFOUND") {
-                unreacheable = true;
-            }
+            unreacheable = true;
         }
 
         return {
@@ -301,7 +298,6 @@ export default {
             if (e.cause?.code === "ENOTFOUND") {
                 return;
             }
-            console.log(e);
 
             return e;
         }

editor/api/index.ts

@@ -47,6 +47,11 @@ export default {
                     name: usernameAndEmail?.username
                 }
             });
+
+            if (searchParams.branch) {
+                await git.pull(project);
+                await git.checkout(project, searchParams.branch);
+            }
         }
 
         return project;

editor/api/packages/index.ts

@@ -1,65 +1,6 @@
 import rpc from "../../rpc";
-import gzip from "gzip-js";
-import untar from "js-untar";
 
 export default {
-    async install(
-        packageName: string,
-        progress: (current: number, total: number) => void,
-        version = "latest"
-    ) {
-        const packageInfoStr = (
-            await rpc().fetch(
-                `https://registry.npmjs.org/${packageName}/${version}`,
-                {
-                    encoding: "utf8"
-                }
-            )
-        ).body as string;
-        const packageInfo = JSON.parse(packageInfoStr);
-        const tarbalUrl = packageInfo.dist.tarball;
-        const tarballData = (await rpc().fetch(tarbalUrl)).body as Uint8Array;
-        const tarData = new Uint8Array(gzip.unzip(tarballData));
-        const nodeModulesDirectory = await rpc().directories.nodeModules();
-        await rpc().fs.mkdir(nodeModulesDirectory + "/" + packageName, {
-            absolutePath: true
-        });
-        const files: {
-            name: string;
-            buffer: ArrayBufferLike;
-            type: string; // https://en.wikipedia.org/wiki/Tar_(computing)#UStar_format
-        }[] = await untar(tarData.buffer);
-        const directoriesToCreate = new Set<string>();
-        for (let i = 0; i < files.length; i++) {
-            const file = files[i];
-            if (file.type === "5") continue;
-            const pathComponents = file.name
-                .slice("package/".length)
-                .split("/");
-            const filename = pathComponents.pop();
-            const directory = pathComponents.join("/");
-
-            const directoryToCreate =
-                nodeModulesDirectory + "/" + packageName + "/" + directory;
-            if (!directoriesToCreate.has(directoryToCreate)) {
-                directoriesToCreate.add(directoryToCreate);
-                await rpc().fs.mkdir(directoryToCreate, { absolutePath: true });
-            }
-
-            await rpc().fs.writeFile(
-                nodeModulesDirectory +
-                    "/" +
-                    packageName +
-                    "/" +
-                    directory +
-                    "/" +
-                    filename,
-                new Uint8Array(file.buffer),
-                { absolutePath: true }
-            );
-            if (progress) progress(i, files.length);
-        }
-    },
     async count() {
         const nodeModulesDirectory = await rpc().directories.nodeModules();
         if (

editor/api/projects/scan.ts

@@ -1,4 +1,4 @@
-import type { Adapter } from "../../../src/adapter";
+import type { Adapter } from "../../../src/adapter/fullstacked";
 import { Dirent } from "../../../src/adapter/fs";
 
 export const scan = async (

editor/api/projects/zip.ts

@@ -1,4 +1,4 @@
-import { Adapter } from "../../../src/adapter";
+import { Adapter } from "../../../src/adapter/fullstacked";
 import { scan } from "./scan";
 import * as zip from "@zip.js/zip.js";
 

editor/constants.ts

@@ -8,3 +8,5 @@ export const DELETE_ALL_PACKAGES_ID = "delete-all-packages";
 export const SETTINGS_BUTTON_ID = "settings";
 export const BACK_BUTTON_ID = "back-button";
 export const PROJECT_TITLE_ID = "project-title";
+export const PACKAGE_INSTALLER_ID = "package-installer";
+export const TYPESCRIPT_ICON_ID = "typescript-icon";

editor/index.scss

@@ -53,3 +53,8 @@ a {
         transform: rotate(1turn);
     }
 }
+
+.cm-search label,
+.cm-button {
+    display: inline-block;
+}

editor/packages/index.scss

@@ -0,0 +1,28 @@
+@import "../style/spacing";
+@import "../style/colors";
+@import "../style/typography";
+
+#package-installer {
+    ul {
+        padding: 0;
+    }
+
+    li {
+        div:last-child {
+            text-align: right;
+            font-size: $font-size-s;
+            color: colorOpacity(white, 0.7);
+        }
+
+        &:not(:last-child) {
+            border-bottom: 1px solid colorOpacity(white, 0.2);
+            padding-bottom: spacing(2);
+            margin-bottom: spacing(2);
+        }
+    }
+
+    .button-group {
+        display: flex;
+        justify-content: flex-end;
+    }
+}