@qlever-llc/trellis 0.9.0-rc.2 → 0.9.0-rc.4

package/esm/npm/src/generate.js

@@ -1,5 +1,4 @@
 import "./_dnt.polyfills.js";
-import * as dntShim from "./_dnt.shims.js";
 const REPO_OWNER = "qlever-llc";
 const REPO_NAME = "trellis";
 const BIN_NAME = "trellis-generate";
@@ -12,14 +11,22 @@ const SUPPORTED_TARGETS = new Set([
 async function main() {
     const localRepoRoot = await findLocalTrellisRepoRoot();
     if (localRepoRoot) {
-        await runLocalGenerator(localRepoRoot, dntShim.Deno.args);
+        await runLocalGenerator(localRepoRoot, denoRuntime().args);
         return;
     }
     const packageVersion = await readPackageVersion();
-    const binary = dntShim.Deno.env.get("TRELLIS_GENERATE_BIN")?.trim() ||
+    const binary = denoRuntime().env.get("TRELLIS_GENERATE_BIN")?.trim() ||
         await ensureCachedReleaseBinary(packageVersion);
     await verifyBinaryVersion(binary, packageVersion);
-    await runBinary(binary, dntShim.Deno.args);
+    await runBinary(binary, denoRuntime().args);
+}
+function denoRuntime() {
+    const getGlobalThis = Function("return globalThis");
+    const deno = getGlobalThis().Deno;
+    if (!deno) {
+        throw new Error("@qlever-llc/trellis/generate requires the Deno runtime");
+    }
+    return deno;
 }
 async function findLocalTrellisRepoRoot() {
     let current = urlDirname(globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).url);
@@ -44,13 +51,30 @@ async function runLocalGenerator(repoRoot, args) {
     ]);
 }
 async function readPackageVersion() {
-    const manifestUrl = new URL("./deno.json", globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).url);
-    const manifest = JSON.parse(await dntShim.Deno.readTextFile(manifestUrl));
+    const manifest = await readFirstManifest([
+        new URL("./deno.json", globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).url),
+        new URL("../../../package.json", globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).url),
+    ]);
     if (typeof manifest.version !== "string" || !manifest.version.trim()) {
         throw new Error("@qlever-llc/trellis package manifest does not declare a version");
     }
     return manifest.version.trim();
 }
+async function readFirstManifest(urls) {
+    const deno = denoRuntime();
+    for (const url of urls) {
+        try {
+            return JSON.parse(await deno.readTextFile(url));
+        }
+        catch (error) {
+            if (error instanceof deno.errors.NotFound) {
+                continue;
+            }
+            throw error;
+        }
+    }
+    throw new Error("@qlever-llc/trellis package manifest was not found");
+}
 async function ensureCachedReleaseBinary(version) {
     const target = releaseTarget();
     const cacheDir = joinPath(cacheRoot(), version, target);
@@ -58,7 +82,8 @@ async function ensureCachedReleaseBinary(version) {
     if (await pathExists(binary)) {
         return binary;
     }
-    await dntShim.Deno.mkdir(cacheDir, { recursive: true });
+    const deno = denoRuntime();
+    await deno.mkdir(cacheDir, { recursive: true });
     const tag = `v${version}`;
     const archiveName = `${BIN_NAME}-${tag}-${target}.tar.gz`;
     const archiveUrl = `https://github.com/${REPO_OWNER}/${REPO_NAME}/releases/download/${tag}/${archiveName}`;
@@ -70,40 +95,42 @@ async function ensureCachedReleaseBinary(version) {
     ]);
     await verifyChecksum(archive, checksumText, archiveUrl);
     const archivePath = joinPath(cacheDir, archiveName);
-    await dntShim.Deno.writeFile(archivePath, archive);
+    await deno.writeFile(archivePath, archive);
     await runCommandChecked("tar", ["-xzf", archivePath, "-C", cacheDir]);
-    await dntShim.Deno.chmod(binary, 0o755);
+    await deno.chmod(binary, 0o755);
     return binary;
 }
 function releaseTarget() {
-    if (SUPPORTED_TARGETS.has(dntShim.Deno.build.target)) {
-        return dntShim.Deno.build.target;
+    const deno = denoRuntime();
+    if (SUPPORTED_TARGETS.has(deno.build.target)) {
+        return deno.build.target;
     }
-    const buildArch = dntShim.Deno.build.arch;
+    const buildArch = deno.build.arch;
     const arch = buildArch === "x86_64" || buildArch === "x64"
         ? "x86_64"
         : buildArch;
-    const os = dntShim.Deno.build.os === "darwin"
+    const os = deno.build.os === "darwin"
         ? "apple-darwin"
-        : dntShim.Deno.build.os === "linux"
+        : deno.build.os === "linux"
             ? "unknown-linux-gnu"
             : undefined;
     const target = os ? `${arch}-${os}` : undefined;
     if (target && SUPPORTED_TARGETS.has(target)) {
         return target;
     }
-    throw new Error(`no ${BIN_NAME} release binary is available for ${dntShim.Deno.build.target}`);
+    throw new Error(`no ${BIN_NAME} release binary is available for ${deno.build.target}`);
 }
 function cacheRoot() {
-    const explicit = dntShim.Deno.env.get("TRELLIS_GENERATE_CACHE")?.trim();
+    const deno = denoRuntime();
+    const explicit = deno.env.get("TRELLIS_GENERATE_CACHE")?.trim();
     if (explicit) {
         return explicit;
     }
-    const xdg = dntShim.Deno.env.get("XDG_CACHE_HOME")?.trim();
+    const xdg = deno.env.get("XDG_CACHE_HOME")?.trim();
     if (xdg) {
         return joinPath(xdg, "trellis", BIN_NAME);
     }
-    const home = dntShim.Deno.env.get("HOME")?.trim();
+    const home = deno.env.get("HOME")?.trim();
     if (!home) {
         throw new Error("HOME or TRELLIS_GENERATE_CACHE must be set to cache trellis-generate");
     }
@@ -139,7 +166,8 @@ async function verifyChecksum(bytes, checksumText, label) {
     }
 }
 async function verifyBinaryVersion(binary, expectedVersion) {
-    const output = await new dntShim.Deno.Command(binary, {
+    const Command = denoRuntime().Command;
+    const output = await new Command(binary, {
         args: ["--version"],
         stdout: "piped",
         stderr: "piped",
@@ -162,7 +190,7 @@ async function runBinary(binary, args) {
 }
 async function runCommand(command, args, options = {}) {
     const status = await spawnCommand(command, args, options);
-    dntShim.Deno.exit(status.code);
+    denoRuntime().exit(status.code);
 }
 async function runCommandChecked(command, args, options = {}) {
     const status = await spawnCommand(command, args, options);
@@ -171,7 +199,8 @@ async function runCommandChecked(command, args, options = {}) {
     }
 }
 async function spawnCommand(command, args, options = {}) {
-    const status = await new dntShim.Deno.Command(command, {
+    const Command = denoRuntime().Command;
+    const status = await new Command(command, {
         args,
         cwd: options.cwd,
         stdin: "inherit",
@@ -181,12 +210,13 @@ async function spawnCommand(command, args, options = {}) {
     return status;
 }
 async function pathExists(path) {
+    const deno = denoRuntime();
     try {
-        await dntShim.Deno.stat(path);
+        await deno.stat(path);
         return true;
     }
     catch (error) {
-        if (error instanceof dntShim.Deno.errors.NotFound) {
+        if (error instanceof deno.errors.NotFound) {
             return false;
         }
         throw error;
@@ -212,6 +242,6 @@ function joinPath(...parts) {
 if (globalThis[Symbol.for("import-meta-ponyfill-esmodule")](import.meta).main) {
     main().catch((error) => {
         console.error(error);
-        dntShim.Deno.exit(1);
+        denoRuntime().exit(1);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlever-llc/trellis",
-  "version": "0.9.0-rc.2",
+  "version": "0.9.0-rc.4",
   "description": "Client-side Trellis runtime, models, and contract helpers for TypeScript applications.",
   "homepage": "https://github.com/Qlever-LLC/trellis#readme",
   "repository": {
@@ -122,7 +122,7 @@
     "ts-deepmerge": "^7.0.3",
     "typebox": "^1.0.15",
     "ulid": "^3.0.1",
-    "@qlever-llc/result": "0.9.0-rc.2"
+    "@qlever-llc/result": "0.9.0-rc.4"
   },
   "devDependencies": {
     "@types/node": "^20.9.0"

package/script/npm/src/generate.js

@@ -1,40 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./_dnt.polyfills.js");
-const dntShim = __importStar(require("./_dnt.shims.js"));
 const REPO_OWNER = "qlever-llc";
 const REPO_NAME = "trellis";
 const BIN_NAME = "trellis-generate";
@@ -47,14 +13,22 @@ const SUPPORTED_TARGETS = new Set([
 async function main() {
     const localRepoRoot = await findLocalTrellisRepoRoot();
     if (localRepoRoot) {
-        await runLocalGenerator(localRepoRoot, dntShim.Deno.args);
+        await runLocalGenerator(localRepoRoot, denoRuntime().args);
         return;
     }
     const packageVersion = await readPackageVersion();
-    const binary = dntShim.Deno.env.get("TRELLIS_GENERATE_BIN")?.trim() ||
+    const binary = denoRuntime().env.get("TRELLIS_GENERATE_BIN")?.trim() ||
         await ensureCachedReleaseBinary(packageVersion);
     await verifyBinaryVersion(binary, packageVersion);
-    await runBinary(binary, dntShim.Deno.args);
+    await runBinary(binary, denoRuntime().args);
+}
+function denoRuntime() {
+    const getGlobalThis = Function("return globalThis");
+    const deno = getGlobalThis().Deno;
+    if (!deno) {
+        throw new Error("@qlever-llc/trellis/generate requires the Deno runtime");
+    }
+    return deno;
 }
 async function findLocalTrellisRepoRoot() {
     let current = urlDirname(globalThis[Symbol.for("import-meta-ponyfill-commonjs")](require, module).url);
@@ -79,13 +53,30 @@ async function runLocalGenerator(repoRoot, args) {
     ]);
 }
 async function readPackageVersion() {
-    const manifestUrl = new URL("./deno.json", globalThis[Symbol.for("import-meta-ponyfill-commonjs")](require, module).url);
-    const manifest = JSON.parse(await dntShim.Deno.readTextFile(manifestUrl));
+    const manifest = await readFirstManifest([
+        new URL("./deno.json", globalThis[Symbol.for("import-meta-ponyfill-commonjs")](require, module).url),
+        new URL("../../../package.json", globalThis[Symbol.for("import-meta-ponyfill-commonjs")](require, module).url),
+    ]);
     if (typeof manifest.version !== "string" || !manifest.version.trim()) {
         throw new Error("@qlever-llc/trellis package manifest does not declare a version");
     }
     return manifest.version.trim();
 }
+async function readFirstManifest(urls) {
+    const deno = denoRuntime();
+    for (const url of urls) {
+        try {
+            return JSON.parse(await deno.readTextFile(url));
+        }
+        catch (error) {
+            if (error instanceof deno.errors.NotFound) {
+                continue;
+            }
+            throw error;
+        }
+    }
+    throw new Error("@qlever-llc/trellis package manifest was not found");
+}
 async function ensureCachedReleaseBinary(version) {
     const target = releaseTarget();
     const cacheDir = joinPath(cacheRoot(), version, target);
@@ -93,7 +84,8 @@ async function ensureCachedReleaseBinary(version) {
     if (await pathExists(binary)) {
         return binary;
     }
-    await dntShim.Deno.mkdir(cacheDir, { recursive: true });
+    const deno = denoRuntime();
+    await deno.mkdir(cacheDir, { recursive: true });
     const tag = `v${version}`;
     const archiveName = `${BIN_NAME}-${tag}-${target}.tar.gz`;
     const archiveUrl = `https://github.com/${REPO_OWNER}/${REPO_NAME}/releases/download/${tag}/${archiveName}`;
@@ -105,40 +97,42 @@ async function ensureCachedReleaseBinary(version) {
     ]);
     await verifyChecksum(archive, checksumText, archiveUrl);
     const archivePath = joinPath(cacheDir, archiveName);
-    await dntShim.Deno.writeFile(archivePath, archive);
+    await deno.writeFile(archivePath, archive);
     await runCommandChecked("tar", ["-xzf", archivePath, "-C", cacheDir]);
-    await dntShim.Deno.chmod(binary, 0o755);
+    await deno.chmod(binary, 0o755);
     return binary;
 }
 function releaseTarget() {
-    if (SUPPORTED_TARGETS.has(dntShim.Deno.build.target)) {
-        return dntShim.Deno.build.target;
+    const deno = denoRuntime();
+    if (SUPPORTED_TARGETS.has(deno.build.target)) {
+        return deno.build.target;
     }
-    const buildArch = dntShim.Deno.build.arch;
+    const buildArch = deno.build.arch;
     const arch = buildArch === "x86_64" || buildArch === "x64"
         ? "x86_64"
         : buildArch;
-    const os = dntShim.Deno.build.os === "darwin"
+    const os = deno.build.os === "darwin"
         ? "apple-darwin"
-        : dntShim.Deno.build.os === "linux"
+        : deno.build.os === "linux"
             ? "unknown-linux-gnu"
             : undefined;
     const target = os ? `${arch}-${os}` : undefined;
     if (target && SUPPORTED_TARGETS.has(target)) {
         return target;
     }
-    throw new Error(`no ${BIN_NAME} release binary is available for ${dntShim.Deno.build.target}`);
+    throw new Error(`no ${BIN_NAME} release binary is available for ${deno.build.target}`);
 }
 function cacheRoot() {
-    const explicit = dntShim.Deno.env.get("TRELLIS_GENERATE_CACHE")?.trim();
+    const deno = denoRuntime();
+    const explicit = deno.env.get("TRELLIS_GENERATE_CACHE")?.trim();
     if (explicit) {
         return explicit;
     }
-    const xdg = dntShim.Deno.env.get("XDG_CACHE_HOME")?.trim();
+    const xdg = deno.env.get("XDG_CACHE_HOME")?.trim();
     if (xdg) {
         return joinPath(xdg, "trellis", BIN_NAME);
     }
-    const home = dntShim.Deno.env.get("HOME")?.trim();
+    const home = deno.env.get("HOME")?.trim();
     if (!home) {
         throw new Error("HOME or TRELLIS_GENERATE_CACHE must be set to cache trellis-generate");
     }
@@ -174,7 +168,8 @@ async function verifyChecksum(bytes, checksumText, label) {
     }
 }
 async function verifyBinaryVersion(binary, expectedVersion) {
-    const output = await new dntShim.Deno.Command(binary, {
+    const Command = denoRuntime().Command;
+    const output = await new Command(binary, {
         args: ["--version"],
         stdout: "piped",
         stderr: "piped",
@@ -197,7 +192,7 @@ async function runBinary(binary, args) {
 }
 async function runCommand(command, args, options = {}) {
     const status = await spawnCommand(command, args, options);
-    dntShim.Deno.exit(status.code);
+    denoRuntime().exit(status.code);
 }
 async function runCommandChecked(command, args, options = {}) {
     const status = await spawnCommand(command, args, options);
@@ -206,7 +201,8 @@ async function runCommandChecked(command, args, options = {}) {
     }
 }
 async function spawnCommand(command, args, options = {}) {
-    const status = await new dntShim.Deno.Command(command, {
+    const Command = denoRuntime().Command;
+    const status = await new Command(command, {
         args,
         cwd: options.cwd,
         stdin: "inherit",
@@ -216,12 +212,13 @@ async function spawnCommand(command, args, options = {}) {
     return status;
 }
 async function pathExists(path) {
+    const deno = denoRuntime();
     try {
-        await dntShim.Deno.stat(path);
+        await deno.stat(path);
         return true;
     }
     catch (error) {
-        if (error instanceof dntShim.Deno.errors.NotFound) {
+        if (error instanceof deno.errors.NotFound) {
             return false;
         }
         throw error;
@@ -247,6 +244,6 @@ function joinPath(...parts) {
 if (globalThis[Symbol.for("import-meta-ponyfill-commonjs")](require, module).main) {
     main().catch((error) => {
         console.error(error);
-        dntShim.Deno.exit(1);
+        denoRuntime().exit(1);
     });
 }