elm-pages 3.0.2 → 3.0.4

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/generator/template/elm.json

@@ -14,7 +14,7 @@
             "dillonkearns/elm-bcp47-language-tag": "1.0.1",
             "dillonkearns/elm-form": "3.0.0",
             "dillonkearns/elm-markdown": "7.0.1",
-            "dillonkearns/elm-pages": "10.0.0",
+            "dillonkearns/elm-pages": "10.0.1",
             "elm/browser": "1.0.2",
             "elm/bytes": "1.0.8",
             "elm/core": "1.0.5",

package/generator/template/package.json

@@ -9,7 +9,7 @@
   "devDependencies": {
     "elm-codegen": "^0.3.0",
     "elm-optimize-level-2": "^0.3.5",
-    "elm-pages": "^3.0.0-beta.42",
+    "elm-pages": "^3.0.3",
     "elm-review": "^2.10.2",
     "elm-tooling": "^1.14.0",
     "vite": "^4.3.5"
@@ -17,4 +17,4 @@
   "dependencies": {
     "@netlify/functions": "^1.4.0"
   }
-}
+}

package/package.json

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

package/src/Internal/Request.elm

@@ -62,11 +62,6 @@ requestDecoder =
         )
 
 
-andMap : Decode.Decoder a -> Decode.Decoder (a -> b) -> Decode.Decoder b
-andMap =
-    Decode.map2 (|>)
-
-
 optionalField : String -> Decode.Decoder a -> Decode.Decoder (Maybe a)
 optionalField fieldName decoder_ =
     let

package/generator/dead-code-review/elm-stuff/generated-code/elm-community/elm-test/0.19.1-revision9/dependencies.c59ecaf7fa8379e3a2d0f793fe9784e3060cb64a6d1fe22b8f6a054502021dbe.json

@@ -1 +0,0 @@
-{"direct":{"elm/core":"1.0.5","elm/json":"1.1.3","elm/random":"1.0.0","elm/time":"1.0.0","elm-community/result-extra":"2.4.0","elm-explorations/test":"2.1.1","jfmengels/elm-review":"2.13.0","stil4m/elm-syntax":"7.2.9"},"indirect":{"elm/bytes":"1.0.8","elm/html":"1.0.0","elm/parser":"1.1.0","elm/project-metadata-utils":"1.0.2","elm/virtual-dom":"1.0.3","elm-community/list-extra":"8.7.0","miniBill/elm-unicode":"1.0.3","rtfeldman/elm-hex":"1.0.0","stil4m/structured-writer":"1.0.3"}}

package/generator/dead-code-review/elm-stuff/generated-code/elm-community/elm-test/0.19.1-revision9/elm.json

@@ -1,38 +0,0 @@
-{
-    "type": "application",
-    "source-directories": [
-        "src",
-        "../../../../../../../node_modules/elm-test/elm/src",
-        "../../../../../src",
-        "../../../../../../../src",
-        "../../../../../tests"
-    ],
-    "elm-version": "0.19.1",
-    "dependencies": {
-        "direct": {
-            "elm/core": "1.0.5",
-            "elm/json": "1.1.3",
-            "elm/random": "1.0.0",
-            "elm/time": "1.0.0",
-            "elm-community/result-extra": "2.4.0",
-            "elm-explorations/test": "2.1.1",
-            "jfmengels/elm-review": "2.13.0",
-            "stil4m/elm-syntax": "7.2.9"
-        },
-        "indirect": {
-            "elm/bytes": "1.0.8",
-            "elm/html": "1.0.0",
-            "elm/parser": "1.1.0",
-            "elm/project-metadata-utils": "1.0.2",
-            "elm/virtual-dom": "1.0.3",
-            "elm-community/list-extra": "8.7.0",
-            "miniBill/elm-unicode": "1.0.3",
-            "rtfeldman/elm-hex": "1.0.0",
-            "stil4m/structured-writer": "1.0.3"
-        }
-    },
-    "test-dependencies": {
-        "direct": {},
-        "indirect": {}
-    }
-}