Fix inferring the package.json in define calls (#98)

Author: CompuIves

packages/git-extractor/src/routes/define.test.ts

@@ -0,0 +1,37 @@
+import { createSandboxFromDefine } from "./define";
+
+it("can infer title and description", async () => {
+  const payload = [
+    {
+      path: "package.json",
+      content: {
+        title: "test",
+        description: "test description",
+        dependencies: {},
+      },
+    },
+  ];
+
+  const result = await createSandboxFromDefine(payload);
+
+  expect(result.title).toBe("test");
+  expect(result.description).toBe("test description");
+});
+
+it("works with leading slashes", async () => {
+  const payload = [
+    {
+      path: "/package.json",
+      content: {
+        title: "test",
+        description: "test description",
+        dependencies: {},
+      },
+    },
+  ];
+
+  const result = await createSandboxFromDefine(payload);
+
+  expect(result.title).toBe("test");
+  expect(result.description).toBe("test description");
+});

packages/git-extractor/src/routes/define.ts

@@ -2,21 +2,26 @@ import { Context } from "koa";
 import createSandbox from "codesandbox-import-utils/lib/create-sandbox";
 import { INormalizedModules, IModule } from "codesandbox-import-util-types";
 
-export const define = async (ctx: Context, next: () => Promise<any>) => {
-  const { files } = ctx.request.body;
-
+export const createSandboxFromDefine = async (files: any) => {
   const normalizedFiles: INormalizedModules = files
-    .map((file: IModule) => {
+    .map((file: IModule & { path: string }) => {
+      if (file.path[0] === "/") {
+        // Remove the leading slash
+        const p = file.path.split("");
+        p.shift();
+        file.path = p.join("");
+      }
+
       if (typeof file.content === "object") {
-        return { ...file, content: JSON.stringify(file.content, null, 2) };
+        file.content = JSON.stringify(file.content, null, 2);
       }
 
       return file;
     })
     .reduce(
       (total: INormalizedModules, next: IModule & { path: string }) => ({
         ...total,
-        [next.path]: next
+        [next.path]: next,
       }),
       {}
     );
@@ -35,9 +40,15 @@ export const define = async (ctx: Context, next: () => Promise<any>) => {
   } catch (e) {
     /* nothing */
   }
-  const sandbox = await createSandbox(normalizedFiles);
 
+  return createSandbox(normalizedFiles);
+};
+
+export const define = async (ctx: Context, next: () => Promise<any>) => {
+  const { files } = ctx.request.body;
+
+  const sandbox = await createSandboxFromDefine(files);
   ctx.body = {
-    sandbox
+    sandbox,
   };
 };

packages/import-utils/src/create-sandbox/index.ts

@@ -71,7 +71,7 @@ export default async function createSandbox(
     console.log(`Creating sandbox with template '${template}'`);
   }
 
-  packageJsonPackage = { main: "/index.html" };
+  packageJsonPackage = packageJsonPackage || { main: "/index.html" };
 
   const mainFileUnix = findMainFile(
     directory,

packages/import-utils/tsconfig.json

@@ -13,6 +13,7 @@
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
     "declaration": true /* Generates corresponding '.d.ts' file. */,
     "sourceMap": true /* Generates corresponding '.map' file. */,
+    "declarationMap": true,
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     "outDir": "./lib" /* Redirect output structure to the directory. */,
     // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
@@ -60,4 +61,4 @@
     "**/__mocks__",
     "**/__tests__"
   ]
-}
+}