elm-pages 3.0.3 → 3.0.5

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 3973992158, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1561605696, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 3973992158,
+  initialSeed: 1561605696,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 1861897373, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 3204223018, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1861897373,
+  initialSeed: 3204223018,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/src/build.js

@@ -635,7 +635,10 @@ export async function compileCliApp(options) {
     // TODO should be --optimize, but there seems to be an issue with the html to JSON with --optimize
     options.debug ? "debug" : "optimize",
     options,
-    path.join(process.cwd(), "elm-stuff/elm-pages/.elm-pages/Main.elm"),
+    path.join(
+      process.cwd(),
+      `elm-stuff/elm-pages/.elm-pages/${options.mainModule || "Main"}.elm`
+    ),
     path.join(process.cwd(), "elm-stuff/elm-pages/elm.js"),
     path.join(process.cwd(), "elm-stuff/elm-pages")
   );

package/generator/src/cli.js

@@ -101,7 +101,7 @@ async function main() {
         await compileElmForScript(elmModulePath);
 
         const { moduleName, projectDirectory, sourceDirectory } =
-          resolveInputPathOrModuleName(elmModulePath);
+          await resolveInputPathOrModuleName(elmModulePath);
 
         const portBackendTaskCompiled = esbuild
           .build({
@@ -146,7 +146,11 @@ async function main() {
         // TODO have option for compiling with --debug or not (maybe allow running with elm-optimize-level-2 as well?)
 
         let executableName = await lamderaOrElmFallback();
-        await build.compileCliApp({ debug: "debug", executableName });
+        await build.compileCliApp({
+          debug: "debug",
+          executableName,
+          mainModule: "ScriptMain",
+        });
         fs.renameSync(
           `${projectDirectory}/elm-stuff/elm-pages/elm.js`,
           `${projectDirectory}/elm-stuff/elm-pages/elm.cjs`
@@ -161,6 +165,7 @@ async function main() {
           moduleName
         );
       } catch (error) {
+        console.trace(error);
         console.log(restoreColorSafe(error));
         process.exit(1);
       }
@@ -186,7 +191,7 @@ async function main() {
     )
     .action(async (elmModulePath, options, options2) => {
       const { moduleName, projectDirectory, sourceDirectory } =
-        resolveInputPathOrModuleName(elmModulePath);
+        await resolveInputPathOrModuleName(elmModulePath);
       await compileElmForScript(elmModulePath);
 
       const cwd = process.cwd();
@@ -204,7 +209,7 @@ async function main() {
 
       try {
         const { moduleName, projectDirectory, sourceDirectory } =
-          resolveInputPathOrModuleName(elmModulePath);
+          await resolveInputPathOrModuleName(elmModulePath);
 
         const portBackendTaskFileFound =
           globby.globbySync(
@@ -346,7 +351,7 @@ async function requireElm(compiledElmPath) {
  * @param {string} moduleName
  */
 function generatorWrapperFile(moduleName) {
-  return `port module Main exposing (main)
+  return `port module ScriptMain exposing (main)
 
 import Pages.Internal.Platform.GeneratorApplication
 import ${moduleName}
@@ -378,7 +383,7 @@ function collect(value, previous) {
 
 async function compileElmForScript(elmModulePath) {
   const { moduleName, projectDirectory, sourceDirectory } =
-    resolveInputPathOrModuleName(elmModulePath);
+    await resolveInputPathOrModuleName(elmModulePath);
   const splitModuleName = moduleName.split(".");
   const expectedFilePath = path.join(
     sourceDirectory,
@@ -396,7 +401,9 @@ async function compileElmForScript(elmModulePath) {
   ensureDirSync(`${projectDirectory}/elm-stuff`);
   ensureDirSync(`${projectDirectory}/elm-stuff/elm-pages/.elm-pages`);
   await fs.promises.writeFile(
-    path.join(`${projectDirectory}/elm-stuff/elm-pages/.elm-pages/Main.elm`),
+    path.join(
+      `${projectDirectory}/elm-stuff/elm-pages/.elm-pages/ScriptMain.elm`
+    ),
     generatorWrapperFile(moduleName)
   );
   let executableName = await lamderaOrElmFallback();
@@ -406,6 +413,22 @@ async function compileElmForScript(elmModulePath) {
     await which("elm");
     executableName = "elm";
   }
+  fs.rmSync(`${projectDirectory}/elm-stuff/elm-pages/parentDirectory`, {
+    recursive: true,
+    force: true,
+  });
+  fs.mkdirSync(`${projectDirectory}/elm-stuff/elm-pages/parentDirectory`);
+  // copy every file ending with '.elm' from `projectDirectory` to `elm-stuff/elm-pages/parentDirectory`
+  const elmFiles = globby.globbySync(`${projectDirectory}/*.elm`);
+  elmFiles.forEach((elmFile) => {
+    fs.copyFileSync(
+      elmFile,
+      `${projectDirectory}/elm-stuff/elm-pages/parentDirectory/${path.basename(
+        elmFile
+      )}`
+    );
+  });
+
   await rewriteElmJson(
     `${projectDirectory}/elm.json`,
     `${projectDirectory}/elm-stuff/elm-pages/elm.json`,

package/generator/src/parse-remote.js

@@ -0,0 +1,43 @@
+/**
+ * @param {string} input
+ */
+export function parse(input) {
+  const patterns = [
+    /https?:\/\/github\.com\/(?<owner>[^/]+)\/(?<repo>[^/]+)(\/(blob|tree)\/(?<branch>[^/]+)(\/(?<filePath>.*)))?(#?.*)$/,
+    /github:(?<owner>[^\/]+)\/(?<repo>[^\/]+):(?<filePath>.*)$/,
+    /http(s)?:\/\/raw\.githubusercontent\.com\/(?<owner>[^\/]+)\/(?<repo>[^\/]+)\/(?<branch>[^\/]+)\/(?<filePath>.*)$/,
+  ];
+  const match = patterns.map((pattern) => input.match(pattern)).find((m) => m);
+
+  if (match) {
+    const g = match.groups;
+    return {
+      remote: `https://github.com/${g.owner}/${g.repo}.git`,
+      filePath: g.filePath || null,
+      branch: g.branch || null,
+      owner: g.owner,
+      repo: g.repo,
+    };
+  } else {
+    const gistPatterns = [
+      /https?:\/\/gist\.github.com\/(?<owner>[^\/]+)\/(?<repo>[^\/]+)(\/?#(?<filePath>.*))?$/,
+      /https?:\/\/gist\.github.com\/(?<repo>[^\/]+)(\/?#(?<filePath>.*))?$/,
+      /https?:\/\/gist\.githubusercontent\.com\/(?<owner>[^\/]+)\/(?<repo>[^\/]+)\/raw\/(?<sha>[^/]+)\/(?<filePath>.*)?$/,
+    ];
+    const gistMatch = gistPatterns
+      .map((pattern) => input.match(pattern))
+      .find((m) => m);
+    if (gistMatch) {
+      const g = gistMatch.groups;
+      return {
+        remote: `https://gist.github.com/${g.repo}.git`,
+        filePath: g.filePath || "Main.elm",
+        branch: null,
+        owner: g.owner || "gist",
+        repo: g.repo,
+      };
+    } else {
+      return null;
+    }
+  }
+}

package/generator/src/render.js

@@ -124,7 +124,7 @@ function runGeneratorAppHelp(
   return new Promise((resolve, reject) => {
     const isBytes = pagePath.match(/content\.dat\/?$/);
 
-    app = elmModule.Elm.Main.init({
+    app = elmModule.Elm.ScriptMain.init({
       flags: {
         compatibilityKey,
         argv: ["", `elm-pages run ${scriptModuleName}`, ...cliOptions],

package/generator/src/resolve-elm-module.js

@@ -1,5 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { spawn } from "cross-spawn";
+import { parse } from "../src/parse-remote.js";
 
 function findNearestElmJson(filePath) {
   function searchForElmJson(directory) {
@@ -48,8 +50,14 @@ function getElmModuleName(inputPath) {
   return { projectDirectory, moduleName, sourceDirectory: matchingSourceDir };
 }
 
-export function resolveInputPathOrModuleName(inputPathOrModuleName) {
-  if (
+export async function resolveInputPathOrModuleName(inputPathOrModuleName) {
+  const parsed = parse(inputPathOrModuleName);
+  if (parsed) {
+    const { filePath } = parsed;
+    const repoPath = await downloadRemoteScript(parsed);
+    const absolutePathForScript = path.join(repoPath, filePath);
+    return getElmModuleName(absolutePathForScript);
+  } else if (
     /^[A-Z][a-zA-Z0-9_]*(\.[A-Z][a-zA-Z0-9_]*)*$/.test(inputPathOrModuleName)
   ) {
     const absolutePathForScript = path.resolve("./script/src");
@@ -62,3 +70,76 @@ export function resolveInputPathOrModuleName(inputPathOrModuleName) {
     return getElmModuleName(inputPathOrModuleName);
   }
 }
+
+async function downloadRemoteScript({ remote, owner, repo, branch }) {
+  try {
+    const cloneToPath = path.join(
+      "elm-stuff",
+      "elm-pages",
+      "remote-scripts",
+      owner,
+      repo
+    );
+
+    const repoExists = fs.existsSync(cloneToPath);
+
+    if (repoExists) {
+      await exec("git", ["pull"], {
+        cwd: cloneToPath,
+      });
+      const defaultBranch = (
+        await exec("git", ["remote", "show", "origin"], {
+          cwd: cloneToPath,
+        })
+      ).match(/HEAD branch: (?<defaultBranch>.*)/).groups.defaultBranch;
+      await exec("git", ["checkout", branch || defaultBranch], {
+        cwd: cloneToPath,
+      });
+    } else {
+      if (branch) {
+        await exec("git", [
+          "clone",
+          "--branch",
+          branch,
+          "--depth=1",
+          remote,
+          cloneToPath,
+        ]);
+      } else {
+        await exec("git", ["clone", "--depth=1", remote, cloneToPath]);
+      }
+    }
+    return cloneToPath;
+  } catch (error) {
+    process.exitCode = 1;
+    throw `I encountered an error cloning the repo:\n\n ${error}`;
+  }
+}
+
+/**
+ * @param {string} command
+ * @param {readonly string[]} args
+ * @param {import("child_process").SpawnOptionsWithoutStdio} [ options ]
+ */
+function exec(command, args, options) {
+  return new Promise(async (resolve, reject) => {
+    let subprocess = spawn(command, args, options);
+    let commandOutput = "";
+
+    subprocess.stderr.on("data", function (data) {
+      commandOutput += data;
+    });
+
+    subprocess.stdout.on("data", function (data) {
+      commandOutput += data;
+    });
+
+    subprocess.on("close", async (code) => {
+      if (code === 0) {
+        resolve(commandOutput);
+      } else {
+        reject(commandOutput);
+      }
+    });
+  });
+}

package/generator/src/rewrite-elm-json.js

@@ -28,8 +28,13 @@ function rewriteElmJsonHelp(elmJson, options) {
     }
   );
   // 2. prepend ../../../ to remaining
+
   elmJson["source-directories"] = elmJson["source-directories"].map((item) => {
-    return "../../" + item;
+    if (item === ".") {
+      return "parentDirectory";
+    } else {
+      return "../../" + item;
+    }
   });
   if (options && options.executableName === "elm") {
     // elm, don't add lamdera/codecs

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",