plumbing/porcelain for build.ts

.github/workflows/build.yml

@@ -76,7 +76,7 @@ jobs:
       - run: cli/scripts/install.ts ${{ steps.sorted.outputs.pre-install }}
 
       # running out of /opt because only pantry.core has these scripts
-      - run: /opt/tea.xyz/var/pantry/scripts/build.ts ${{ steps.sorted.outputs.pkgs }}
+      - run: /opt/tea.xyz/var/pantry/scripts/build.plumbing.ts ${{ steps.sorted.outputs.pkgs }}
         id: build
         env:
           # GITHUB_TOKEN doesn't have private access to teaxyz/cli.

projects/zlib.net/package.yml

@@ -21,4 +21,4 @@ test:
     OUT=$(echo "$INPUT" | ./a.out | ./a.out -d)
     test "$OUT" = "$INPUT"
   env:
-    INPUT: Hello, World!
+    INPUT: Hello, World!

scripts/bottle.ts

@@ -14,8 +14,6 @@ args:
   - --allow-read
   - --allow-write
   - --import-map={{ srcroot }}/import-map.json
-env:
-  TEA_PANTRY_PATH: "{{srcroot}}"
 --- */
 
 import { Installation } from "types"

scripts/build.plumbing.ts

@@ -0,0 +1,61 @@
+#!/usr/bin/env -S tea -E
+
+/*---
+dependencies:
+  gnu.org/tar: 1
+  tukaani.org/xz: 5
+  sourceware.org/bzip2: 1
+args:
+  - deno
+  - run
+  - --allow-net
+  - --allow-run
+  - --allow-read
+  - --allow-write={{tea.prefix}}
+  - --allow-env
+  - --import-map={{ srcroot }}/import-map.json
+---*/
+
+import { usePantry } from "hooks"
+import { Installation } from "types"
+import { pkg as pkgutils } from "utils"
+import { useFlags, usePrefix } from "hooks"
+import { set_output } from "./utils/gha.ts"
+import build, { BuildResult } from "./build/build.ts"
+import * as ARGV from "./utils/args.ts"
+import Path from "path"
+
+useFlags()
+
+const pantry = usePantry()
+const dry = await ARGV.toArray(ARGV.pkgs())
+const gha = !!Deno.env.get("GITHUB_ACTIONS")
+const group_it = gha && dry.length > 1
+const rv: BuildResult[] = []
+
+for (const rq of dry) {
+  const pkg = await pantry.resolve(rq)
+
+  if (group_it) {
+    console.log("::group::", pkgutils.str(pkg))
+  } else {
+    console.log({ building: pkg.project })
+  }
+
+  rv.push(await build(pkg))
+
+  if (group_it) {
+    console.log("::endgroup::")
+  }
+}
+
+const to = usePrefix()
+await set_output("pkgs", rv.map(x => pkgutils.str(x.installation.pkg)))
+await set_output("paths", rv.map(x => x.installation.path), '%0A')
+await set_output("relative-paths", rv.map(x => x.installation.path.relative({ to })))
+await set_output("srcs", rv.map(x => x.src?.relative({ to }) ?? "~"))
+await set_output("srcs-relative-paths", rv.compact(x => x.src?.relative({ to })))
+
+interface InstallationPlus extends Installation {
+  src: Path
+}

scripts/build.ts

@@ -1,10 +1,6 @@
 #!/usr/bin/env -S tea -E
 
 /*---
-dependencies:
-  gnu.org/tar: 1
-  tukaani.org/xz: 5
-  sourceware.org/bzip2: 1
 args:
   - deno
   - run
@@ -13,51 +9,36 @@ args:
   - --allow-read
   - --allow-write={{tea.prefix}}
   - --allow-env
+  - --unstable
   - --import-map={{ srcroot }}/import-map.json
-env:
-  TEA_PANTRY_PATH: "{{srcroot}}"
 ---*/
 
-import { usePantry } from "hooks"
+import { usePantry, useFlags, useCellar, useInventory } from "hooks"
-import { Installation } from "types"
+import { hydrate, install, link } from "prefab"
-import { pkg as pkgutils } from "utils"
-import { useFlags, usePrefix } from "hooks"
-import { set_output } from "./utils/gha.ts"
-import build, { BuildResult } from "./build/build.ts"
 import * as ARGV from "./utils/args.ts"
-import Path from "path"
+import { panic } from "utils/error.ts"
+import build from "./build/build.ts"
 
 useFlags()
 
 const pantry = usePantry()
+const cellar = useCellar()
+const inventory = useInventory()
 const dry = await ARGV.toArray(ARGV.pkgs())
-const gha = !!Deno.env.get("GITHUB_ACTIONS")
+const wet = await hydrate(dry, async (pkg, dry) => {
-const group_it = gha && dry.length > 1
+  const deps = await pantry.getDeps(pkg)
-const rv: BuildResult[] = []
+  return dry ? [...deps.build, ...deps.runtime] : deps.runtime
+})
+
+for (const pkg of wet.wet) {
+  if (!await cellar.has(pkg)) {
+    const version = await inventory.select(pkg) ?? panic()
+    await install({ project: pkg.project, version })
+  }
+}
 
 for (const rq of dry) {
   const pkg = await pantry.resolve(rq)
-
+  await build(pkg)
-  if (group_it) {
+  await link(pkg)
-    console.log("::group::", pkgutils.str(pkg))
-  } else {
-    console.log({ building: pkg.project })
-  }
-
-  rv.push(await build(pkg))
-
-  if (group_it) {
-    console.log("::endgroup::")
-  }
-}
-
-const to = usePrefix()
-await set_output("pkgs", rv.map(x => pkgutils.str(x.installation.pkg)))
-await set_output("paths", rv.map(x => x.installation.path), '%0A')
-await set_output("relative-paths", rv.map(x => x.installation.path.relative({ to })))
-await set_output("srcs", rv.map(x => x.src?.relative({ to }) ?? "~"))
-await set_output("srcs-relative-paths", rv.compact(x => x.src?.relative({ to })))
-
-interface InstallationPlus extends Installation {
-  src: Path
 }

scripts/deps.ts

@@ -7,8 +7,6 @@ args:
   - --allow-read
   - --allow-env
   - --import-map={{ srcroot }}/import-map.json
-env:
-  TEA_PANTRY_PATH: "{{srcroot}}"
 ---*/
 
 import { PackageRequirement } from "types"

scripts/fetch.ts

@@ -10,8 +10,6 @@ args:
   - --allow-write={{ tea.prefix }}
   - --allow-env
   - --import-map={{ srcroot }}/import-map.json
-env:
-  TEA_PANTRY_PATH: "{{srcroot}}"
 ---*/
 
 //TODO verify the sha

scripts/sort.ts

@@ -7,8 +7,6 @@ args:
   - --allow-read
   - --allow-env
   - --import-map={{ srcroot }}/import-map.json
-env:
-  TEA_PANTRY_PATH: "{{srcroot}}"
 ---*/
 
 // sorts input for building

scripts/test.ts

@@ -11,8 +11,6 @@ args:
   - --allow-env
   - --unstable
   - --import-map={{ srcroot }}/import-map.json
-env:
-  TEA_PANTRY_PATH: "{{srcroot}}"
 ---*/
 
 import { Installation, Package, PackageRequirement } from "types"

scripts/utils/misc.ts

@@ -1,9 +0,0 @@
-export function overlay_this_pantry() {
-  const self = new URL(import.meta.url).path().parent().parent().parent().join("projects")
-
-  // if unset just assume the user wants this
-  // this is magic in a bad way, but for now is what we're doing
-  if (!!Deno.env.get("TEA_PANTRY_PATH")) {
-    Deno.env.set("TEA_PANTRY_PATH", self.string)
-  }
-}