Compare commits

...

12 Commits

Author SHA1 Message Date
Quixos Subtree Publisher e2747066ca Publish quixos-nix-helpers from 1de28b236de076d239752b77553f833dfbdb5b43 2026-09-16 23:49:09 +00:00
Timothy J. Aveni 0c3c9c6ad8 Revert generated-file renaming; retain formatter exclusions 2026-09-15 20:13:10 -07:00
Timothy J. Aveni b3d31b37b3 Mark first-party generated files with .gen; preserve third-party conventions 2026-09-15 17:57:46 -07:00
Timothy J. Aveni 6f3814587f Format authored monorepo code with pinned language formatters 2026-09-15 15:41:24 -07:00
Timothy J. Aveni 1c09bf43c2 Simplify workspace authoring and isolate managed component styles
Use imperative scaffolds without a registry/refresh lifecycle; preserve authored runtime wiring and generate checked descriptors. Consolidate binding options, embed checked TSX/CSS source, queue mutable convergence while allowing parallel immutable checks, and preload real CLI observations. Add Shadow DOM boundaries with scoped overlays and composed-event handling. Update template/toolchain pins and document VM-free authoring, browser, and stateful acceptance; no deployment or default-template selection.
2026-09-14 20:55:32 -07:00
Quixos Subtree Publisher 6657af7ca0 Publish quixos-nix-helpers from 8484d99fcf78a49341a17597bc62211e5f1807dd 2026-09-15 03:49:38 +00:00
Timothy J. Aveni e3080467c9 Simplify workspace authoring and isolate managed component styles 2026-09-14 20:49:38 -07:00
Quixos Subtree Publisher e84b62f4d6 Publish quixos-nix-helpers from fc13e9b8411c2210b12db5e558e2b4fa7785505e 2026-09-15 03:42:37 +00:00
Timothy J. Aveni 06c668b587 Simplify workspace authoring and isolate managed component styles 2026-09-14 20:42:37 -07:00
Timothy J. Aveni 56fa26acc8 Unify workspace authoring, verification and scaffolding workflows
Use exact jj snapshots and one candidate-bound Nix builder for incremental checks, template validation and activation. Keep provenance internal and separate recovery checkpoint failures from local command success.

Provision workspace-scoped managed package/interface repositories with recoverable Central effects. Add TypeScript/React presets, function and dependency commands, and scaffold enrollment for all TODO packages. Install authoring guides and controlled Codex sandbox rules.

Invalidate module resolutions across cutover, including in-flight races, and content-address host platform entries. Strengthen domain-model and verification instructions.

Validated real jj/Nix authoring, React/Slate dependency installation, bottom-up local Git publication, packaged CLI tests, PostgreSQL recovery/auth tests, Web Studio tests and host configuration. Public protocol/helpers and the validated 19-resource TODO template are published. Retained the approved exact private baseline and updated the installation's default template pin to 68d54f0d52be433ebf60bdc1faf7646c57f90307. Master and live deployments remain unchanged. See docs/WORKSPACE_AUTHORING_PROGRESS.md.
2026-09-13 23:06:38 -07:00
Quixos Subtree Publisher cf7945abb6 Publish quixos-nix-helpers from 7fd5e15105cef21d2b1c3da860c53c5033f66256 2026-09-14 05:46:08 +00:00
Timothy J. Aveni 74b6ff2ace Unify workspace authoring, verification and scaffolding workflows 2026-09-13 22:46:08 -07:00
5 changed files with 580 additions and 411 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
{
"version": 1,
"sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos",
"sourceCommit": "22bb3d02264980d74de65c34bbbcb81764dc65c0",
"sourceCommit": "1de28b236de076d239752b77553f833dfbdb5b43",
"sourcePath": "quixos-instance/quixos-nix-helpers",
"exportName": "quixos-nix-helpers",
"mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos-nix-helpers.git"
+69
View File
@@ -0,0 +1,69 @@
import { createRequire } from "node:module";
import path from "node:path";
// Resolve build dependencies from the package's locked node_modules, not from
// the helper's own Nix-store location. This program runs only during the build.
const require = createRequire(path.join(process.cwd(), "package.json"));
const { build } = require("esbuild");
const options = JSON.parse(process.argv[2]);
const platform = new Map([
["react", "/__quixos/platform/react/v18.mjs"],
["react/jsx-runtime", "/__quixos/platform/react-jsx-runtime/v18.mjs"],
["react/jsx-dev-runtime", "/__quixos/platform/react-jsx-dev-runtime/v18.mjs"],
["@quixos/web-studio-react-runtime", "/__quixos/platform/web-studio-react-runtime/v1.mjs"],
]);
await build({
...options,
plugins: [
{
name: "quixos-browser-source",
setup(api) {
api.onResolve({ filter: /\?browser-source$/ }, async ({ path: specifier, resolveDir }) => {
if (!specifier.startsWith("./") && !specifier.startsWith("../"))
throw new Error("Browser source imports must name a relative compiled module");
const resolved = await api.resolve(specifier.slice(0, -"?browser-source".length), {
resolveDir,
kind: "import-statement",
});
if (resolved.errors.length) return { errors: resolved.errors };
return { path: resolved.path, namespace: "browser-source" };
});
api.onLoad({ filter: /.*/, namespace: "browser-source" }, async ({ path: entry }) => {
const browser = await build({
entryPoints: [entry],
bundle: true,
write: false,
outfile: "component.mjs",
format: "esm",
platform: "browser",
target: "es2022",
metafile: true,
plugins: [
{
name: "quixos-platform",
setup(browserApi) {
browserApi.onResolve({ filter: /.*/ }, ({ path: name }) =>
platform.has(name) ? { path: platform.get(name), external: true } : undefined,
);
},
},
],
});
const js = browser.outputFiles.find((file) => file.path.endsWith(".mjs"));
if (!js) throw new Error("Browser source build produced no JavaScript");
const css = browser.outputFiles.find((file) => file.path.endsWith(".css"));
if (css && Object.values(browser.metafile.outputs).some((output) => output.exports?.includes("styles")))
throw new Error("Use either imported CSS or an explicit styles export, not both");
if (browser.outputFiles.some((file) => !file.path.endsWith(".mjs") && !file.path.endsWith(".css")))
throw new Error("Browser assets must be embedded, not emitted as unserved files");
const source = js.text + (css ? `\nexport const styles = ${JSON.stringify(css.text)};\n` : "");
return {
contents: `export default ${JSON.stringify(source)};`,
loader: "js",
watchFiles: Object.keys(browser.metafile.inputs),
};
});
},
},
],
});
+32 -9
View File
@@ -1,17 +1,40 @@
import fs from "node:fs";
import crypto from "node:crypto";
const [schemaPath, packageRevisionId, bindingOutput, generatorPath, output] = process.argv.slice(2);
if (!schemaPath || !packageRevisionId || !bindingOutput || !generatorPath || !output) throw new Error("Missing candidate check receipt inputs");
const canonical = (value) => Array.isArray(value) ? value.map(canonical) : value && typeof value === "object"
? Object.fromEntries(Object.entries(value).sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([key, entry]) => [key, canonical(entry)])) : value;
const hash = (value) => `sha256:${crypto.createHash("sha256").update(JSON.stringify(canonical(value))).digest("hex")}`;
if (!schemaPath || !packageRevisionId || !bindingOutput || !generatorPath || !output)
throw new Error("Missing candidate check receipt inputs");
const canonical = (value) =>
Array.isArray(value)
? value.map(canonical)
: value && typeof value === "object"
? Object.fromEntries(
Object.entries(value)
.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))
.map(([key, entry]) => [key, canonical(entry)]),
)
: value;
const hash = (value) =>
`sha256:${crypto
.createHash("sha256")
.update(JSON.stringify(canonical(value)))
.digest("hex")}`;
const schema = JSON.parse(fs.readFileSync(schemaPath, "utf8"));
if (!schema.packages.some((entry) => entry.revisionId === packageRevisionId)) throw new Error("Checked binding schema lacks the package");
if (!schema.packages.some((entry) => entry.revisionId === packageRevisionId))
throw new Error("Checked binding schema lacks the package");
const generated = fs.readFileSync(bindingOutput, "utf8");
if (generated !== fs.readFileSync(".qx-checked-bindings", "utf8")) throw new Error("Build replaced candidate-generated bindings; its check is not evidence for this candidate");
if (generated !== fs.readFileSync(".qx-checked-bindings", "utf8"))
throw new Error("Build replaced candidate-generated bindings; its check is not evidence for this candidate");
const receipt = {
schemaVersion: 1, packageRevisionId, success: true, bindingSchema: schema,
bindingSchemaDigest: hash(schema), generatedDigest: hash(generated),
checkerDigest: hash({ generatorPath, compiler: JSON.parse(fs.readFileSync("node_modules/typescript/package.json", "utf8")), lock: fs.readFileSync("yarn.lock", "utf8") }),
schemaVersion: 1,
packageRevisionId,
success: true,
bindingSchema: schema,
bindingSchemaDigest: hash(schema),
generatedDigest: hash(generated),
checkerDigest: hash({
generatorPath,
compiler: JSON.parse(fs.readFileSync("node_modules/typescript/package.json", "utf8")),
lock: fs.readFileSync("yarn.lock", "utf8"),
}),
};
fs.writeFileSync(output, `${JSON.stringify(receipt, null, 2)}\n`, { flag: "wx" });
-13
View File
@@ -1,13 +0,0 @@
# The caller has compiled this package and its exact recursive candidate graph.
# No credentials, mutable references, or workspace-wide unrelated schema enter
# the package derivation. Ordinary #server builds are not promotion evidence.
{ source, schema, generator, packageRevisionId, system ? builtins.currentSystem }:
let
package = builtins.getFlake ("path:" + source);
checked = package.quixosPackages.${system}.checkedServer or
(throw "Package ${packageRevisionId} lacks checkedServer. Upgrade its Nix helper and adopt generated implementation bindings before cutover.");
in checked {
inherit packageRevisionId;
schema = builtins.path { path = /. + schema; name = "candidate-package-bindings.json"; };
generator = builtins.storePath generator;
}
+232 -142
View File
@@ -19,23 +19,25 @@ let
schemaMainPathDefault = "dist/quixos-package-schema.js";
schemaPackageName = schemaPackageJson.name or "schema";
selfSchemaName =
if pkgs.lib.hasInfix "/" schemaPackageName
then pkgs.lib.last (pkgs.lib.splitString "/" schemaPackageName)
else schemaPackageName;
if pkgs.lib.hasInfix "/" schemaPackageName then
pkgs.lib.last (pkgs.lib.splitString "/" schemaPackageName)
else
schemaPackageName;
flakeText =
builtins.replaceStrings
[ "\n" "\r" "\t" ]
[ " " " " " " ]
(builtins.readFile "${flakeRoot}/flake.nix");
flakeText = builtins.replaceStrings [ "\n" "\r" "\t" ] [ " " " " " " ] (
builtins.readFile "${flakeRoot}/flake.nix"
);
getInputUrl = inputName:
getInputUrl =
inputName:
let
pattern1 = ".*" + inputName + "[[:space:]]*\\.url[[:space:]]*=[[:space:]]*\"([^\"]+)\".*";
pattern2 = ".*" + inputName + "[[:space:]]*=[[:space:]]*\\{[^}]*url[[:space:]]*=[[:space:]]*\"([^\"]+)\".*";
pattern2 =
".*" + inputName + "[[:space:]]*=[[:space:]]*\\{[^}]*url[[:space:]]*=[[:space:]]*\"([^\"]+)\".*";
match1 = builtins.match pattern1 flakeText;
match2 = if match1 != null then match1 else builtins.match pattern2 flakeText;
in if match2 == null then null else builtins.elemAt match2 0;
in
if match2 == null then null else builtins.elemAt match2 0;
schemaBase =
(pkgs.callPackage "${schemaDir}/yarn-project.nix" {
@@ -65,51 +67,44 @@ let
'';
});
schemaInputs =
pkgs.lib.filterAttrs (name: _: pkgs.lib.hasPrefix schemaPrefix name) inputs;
schemaInputs = pkgs.lib.filterAttrs (name: _: pkgs.lib.hasPrefix schemaPrefix name) inputs;
decodeSchemaInputName = encodedName:
builtins.replaceStrings [ "__" ] [ "." ] encodedName;
decodeSchemaInputName = encodedName: builtins.replaceStrings [ "__" ] [ "." ] encodedName;
schemaPackagesFromInputs =
pkgs.lib.mapAttrs'
(name: flake:
schemaPackagesFromInputs = pkgs.lib.mapAttrs' (
name: flake:
let
schemaName =
decodeSchemaInputName (pkgs.lib.removePrefix schemaPrefix name);
schemaName = decodeSchemaInputName (pkgs.lib.removePrefix schemaPrefix name);
in
{
name = schemaName;
value = flake.packages.${system}.schema;
})
schemaInputs;
}
) schemaInputs;
schemaPackages = schemaPackagesFromInputs // { "${selfSchemaName}" = schema; };
schemaPackages = schemaPackagesFromInputs // {
"${selfSchemaName}" = schema;
};
schemaMetaByName =
pkgs.lib.mapAttrs'
(name: flake:
schemaMetaByName = pkgs.lib.mapAttrs' (
name: flake:
let
schemaName =
decodeSchemaInputName (pkgs.lib.removePrefix schemaPrefix name);
schemaName = decodeSchemaInputName (pkgs.lib.removePrefix schemaPrefix name);
sourceInfo = if flake ? sourceInfo then flake.sourceInfo else { };
sourceRev = sourceInfo.rev or null;
inputUrl = getInputUrl name;
urlBase =
if inputUrl == null
then null
else builtins.head (pkgs.lib.splitString "?" inputUrl);
urlBase = if inputUrl == null then null else builtins.head (pkgs.lib.splitString "?" inputUrl);
isDisallowed =
inputUrl == null
|| pkgs.lib.hasPrefix "path:" inputUrl
|| pkgs.lib.hasPrefix "file:" inputUrl
|| pkgs.lib.hasPrefix "git+file:" inputUrl;
flakeRef =
if isDisallowed || sourceRev == null || urlBase == null
then null
else urlBase + "?rev=" + sourceRev;
meta =
{
if isDisallowed || sourceRev == null || urlBase == null then
null
else
urlBase + "?rev=" + sourceRev;
meta = {
name = "@quixos-package-schemas/${schemaName}";
type = sourceInfo.type or null;
url = inputUrl;
@@ -117,16 +112,16 @@ let
flakeRef = flakeRef;
};
in
if flakeRef == null
then throw "Schema input ${schemaName} must be a git flake with url+rev"
else {
if flakeRef == null then
throw "Schema input ${schemaName} must be a git flake with url+rev"
else
{
name = schemaName;
value = meta;
})
schemaInputs;
}
) schemaInputs;
schemaMetaJsonByName =
pkgs.lib.mapAttrs (_: meta: builtins.toJSON meta) schemaMetaByName;
schemaMetaJsonByName = pkgs.lib.mapAttrs (_: meta: builtins.toJSON meta) schemaMetaByName;
schemaExtensionsBlock = pkgs.lib.concatStringsSep "\n" (
[
@@ -151,12 +146,11 @@ let
);
schemaInstallCommands = pkgs.lib.concatStringsSep "\n" (
pkgs.lib.mapAttrsToList (name: drv:
pkgs.lib.mapAttrsToList (
name: drv:
let
metaJson =
if pkgs.lib.hasAttr name schemaMetaJsonByName
then schemaMetaJsonByName.${name}
else null;
if pkgs.lib.hasAttr name schemaMetaJsonByName then schemaMetaJsonByName.${name} else null;
in
''
schema_pkg="$(ls -d ${drv}/libexec/* | head -n1)"
@@ -166,15 +160,15 @@ let
chmod -R u+w "$dest"
''
+ (
if metaJson != null
then ''
if metaJson != null then
''
schema_main="${schemaMainPathDefault}"
if [ -f "$dest/$schema_main" ]; then
block_tmp="$(mktemp -p "$dest")"
tmp_out="$(mktemp -p "$dest")"
cat > "$block_tmp" <<'EOF'
packageSchema.__quixos = ${metaJson};
EOF
packageSchema.__quixos = ${metaJson};
EOF
chmod u+w "$dest/$schema_main"
if grep -q '^export default ' "$dest/$schema_main"; then
awk -v blockFile="$block_tmp" '
@@ -205,7 +199,8 @@ EOF
rm -f "$block_tmp" "$tmp_out"
fi
''
else ""
else
""
)
) schemaPackages
);
@@ -240,7 +235,8 @@ EOF
schemaInstallCommands
updateYarnrcScript
schemaExtensionsBlockEscaped
selfSchemaName;
selfSchemaName
;
};
mkTsPackageServer =
@@ -265,9 +261,10 @@ EOF
nodejs' = if nodejs != null then nodejs else pkgs.nodejs_24;
git' = if git != null then git else pkgs.git;
templatePreparePackages' =
if templatePreparePackages != null
then templatePreparePackages
else [
if templatePreparePackages != null then
templatePreparePackages
else
[
pkgs.findutils
git'
pkgs.gnused
@@ -291,28 +288,33 @@ EOF
runtimeBinPath = pkgs.lib.makeBinPath extraRuntimePackages;
runtimeLibPath = pkgs.lib.makeLibraryPath extraRuntimePackages;
runtimeWrap =
if extraRuntimePackages == [ ]
then ""
else ''
if extraRuntimePackages == [ ] then
""
else
''
wrapProgram "$out/bin/${serverBin}" \
--prefix PATH : ${runtimeBinPath} \
--prefix LD_LIBRARY_PATH : ${runtimeLibPath}
'';
server = base.overrideAttrs (old:
server = base.overrideAttrs (
old:
let
extraAttrs = serverOverrides old;
in
{
buildInputs = (old.buildInputs or [ ]) ++ extraBuildInputs;
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
nativeBuildInputs =
(old.nativeBuildInputs or [ ])
++ [
pkgs.python3
pkgs.gnumake
pkgs.gcc
pkgs.pkg-config
pkgs.makeWrapper
] ++ extraNativeBuildInputs;
]
++ extraNativeBuildInputs;
# node-gyp will look at these
PYTHON = "${pkgs.python3}/bin/python3";
@@ -326,13 +328,14 @@ EOF
buildPhase =
(old.buildPhase or "")
+ (
if buildCommand != null
then ''
if buildCommand != null then
''
runHook preBuildQuixos
${buildCommand}
runHook postBuildQuixos
''
else ""
else
""
);
postFixup = (old.postFixup or "") + runtimeWrap;
@@ -342,7 +345,8 @@ EOF
mkdir -p "$pkg_root/quixos-package-schemas"
(cd "$pkg_root" && ${schemaSupport.schemaInstallCommands})
'';
} // extraAttrs
}
// extraAttrs
);
check = server.overrideAttrs (old: {
@@ -360,7 +364,12 @@ EOF
};
in
{
inherit server check packageName serverBin;
inherit
server
check
packageName
serverBin
;
devShells = {
"quixos-prepare" = prepareShell;
@@ -392,13 +401,18 @@ EOF
pkgs = import nixpkgs { inherit system; };
schemaSupport = mkSchemaSupport {
inherit pkgs inputs system schemaDir schemaPrefix self flakeRoot;
inherit
pkgs
inputs
system
schemaDir
schemaPrefix
self
flakeRoot
;
};
normalizeList = value:
if builtins.isFunction value
then value pkgs
else value;
normalizeList = value: if builtins.isFunction value then value pkgs else value;
serverResult = serverBuilder {
inherit pkgs schemaSupport;
@@ -408,26 +422,28 @@ EOF
};
combinedName = pkgs.lib.strings.sanitizeDerivationName (
if packageName != null
then packageName
else if serverResult ? packageName
then serverResult.packageName
else "quixos-package"
if packageName != null then
packageName
else if serverResult ? packageName then
serverResult.packageName
else
"quixos-package"
);
packageServer = serverResult.server;
packageServerCheck = if serverResult ? check then serverResult.check else null;
appProgramFinal =
if appProgram != null
then appProgram
else if serverResult ? appProgram
then serverResult.appProgram
else "${packageServer}/bin/${serverResult.serverBin or "server"}";
if appProgram != null then
appProgram
else if serverResult ? appProgram then
serverResult.appProgram
else
"${packageServer}/bin/${serverResult.serverBin or "server"}";
devShellHookBase =
if enableYarnrcHook
then ''
if enableYarnrcHook then
''
find_schema_root() {
dir="$PWD"
while [ "$dir" != "/" ]; do
@@ -455,21 +471,26 @@ EOF
fi
fi
''
else "";
else
"";
devShellHook = devShellHookBase + extraDevShellHook;
devShellPackages = normalizeList extraDevShellPackages;
checks =
{ schema = schemaSupport.schemaCheck; }
checks = {
schema = schemaSupport.schemaCheck;
}
// (if packageServerCheck != null then { default = packageServerCheck; } else { });
extraDevShells = if serverResult ? devShells then serverResult.devShells else { };
in
{
packages.default = pkgs.symlinkJoin {
name = combinedName;
paths = [ packageServer schemaSupport.schema ];
paths = [
packageServer
schemaSupport.schema
];
};
packages.server = packageServer;
packages.schema = schemaSupport.schema;
@@ -512,10 +533,19 @@ EOF
# Language-neutral, offline schema compilation. Snapshot directories must be
# fixed Nix inputs matching the resource lock's complete dependency closure.
mkQxBindingSchema = { pkgs, protocol, src, repository, commit, resources ? [ ] }:
mkQxBindingSchema =
{
pkgs,
protocol,
src,
repository,
commit,
resources ? [ ],
}:
let
snapshots = pkgs.writeText "qx-binding-snapshots.json" (builtins.toJSON { inherit resources; });
in pkgs.runCommand "qx-binding-schema.json" { } ''
in
pkgs.runCommand "qx-binding-schema.json" { } ''
${protocol}/bin/quixos-resource-compile \
--root ${src} --kind package \
--repository ${pkgs.lib.escapeShellArg repository} \
@@ -539,7 +569,6 @@ EOF
# An exact, compiler-produced BindingSchema JSON artifact and a backend.
# Other language helpers can consume the same schema with their own generator/runtime.
bindings ? null,
bindingOptions ? { },
# A dedicated entrypoint calling SDK serveMigration; never start the
# normal package server in the isolated migration execution boundary.
migrationEntrypoint ? null,
@@ -552,23 +581,21 @@ EOF
flake-utils.lib.eachDefaultSystem (
system:
let
outputsFor = candidateBindings:
outputsFor =
candidateBindings:
let
pkgs = import nixpkgs { inherit system; };
lib = pkgs.lib;
nodejs = pkgs.${nodejsAttr};
callOption = value:
if builtins.isFunction value
then value { inherit inputs pkgs system; }
else value;
callOption =
value: if builtins.isFunction value then value { inherit inputs pkgs system; } else value;
packageJson = builtins.fromJSON (builtins.readFile "${packageRoot}/package.json");
packageNameFinal = if packageName != null then packageName else packageJson.name or "quixos-package";
packageNameFinal =
if packageName != null then packageName else packageJson.name or "quixos-package";
promptNameFinal =
if promptName != null
then promptName
else lib.strings.sanitizeDerivationName packageNameFinal;
if promptName != null then promptName else lib.strings.sanitizeDerivationName packageNameFinal;
sourcePackage = mkCaminoSourcePackage {
inherit pkgs;
@@ -576,31 +603,52 @@ EOF
name = sourceName;
};
exportsFor = attrs:
exportsFor =
attrs:
lib.concatStringsSep "\n" (
lib.mapAttrsToList
(name: value: "export ${name}=${lib.escapeShellArg (toString value)}")
attrs
lib.mapAttrsToList (name: value: "export ${name}=${lib.escapeShellArg (toString value)}") attrs
);
bindingConfig = if candidateBindings != null then candidateBindings
else if bindings == null then null else callOption bindings;
bindingSchema = if bindingConfig == null then null else bindingConfig.schema or (mkQxBindingSchema {
bindingConfig =
if candidateBindings != null then
candidateBindings
else if bindings == null then
null
else
callOption bindings;
bindingSchema =
if bindingConfig == null then
null
else
bindingConfig.schema or (mkQxBindingSchema {
inherit pkgs;
protocol = bindingConfig.generator;
src = packageRoot;
inherit (bindingConfig) repository commit;
resources = bindingConfig.resources or [ ];
});
bindingOutput = if bindingConfig == null then "src/gen/qx.ts" else bindingConfig.output or "src/gen/qx.ts";
bindingOptionsFile = if bindingConfig == null then null else
pkgs.writeText "qx-typescript-options.json" (builtins.toJSON (bindingConfig.options or bindingOptions));
bindingCommand = if bindingConfig == null then "" else ''
bindingOutput =
if bindingConfig == null then "src/gen/qx.ts" else bindingConfig.output or "src/gen/qx.ts";
authoringCheck = builtins.fromJSON (builtins.readFile "${packageRoot}/quixos.check.json");
bindingOptionsFile =
if bindingConfig == null then
null
else
pkgs.writeText "qx-typescript-options.json" (builtins.toJSON (authoringCheck.options or { }));
bindingCommand =
if bindingConfig == null then
""
else
''
mkdir -p ${lib.escapeShellArg (dirOf bindingOutput)}
${bindingConfig.generator}/bin/quixos-codegen-ts \
${lib.escapeShellArg (toString bindingSchema)} \
${lib.escapeShellArg bindingConfig.packageRevisionId} \
${lib.escapeShellArg bindingOutput} ${bindingOptionsFile}
${lib.optionalString (installServer != null && descriptorPath != null) ''
${bindingConfig.generator}/bin/quixos-qx package-descriptor ${lib.escapeShellArg (toString bindingSchema)} \
${lib.escapeShellArg bindingConfig.packageRevisionId} > ${lib.escapeShellArg descriptorPath}
''}
'';
generateBindings = pkgs.writeShellApplication {
name = "qx-generate-bindings";
@@ -613,19 +661,38 @@ EOF
bundleTarget = bundleConfig.target or "node24";
bundleFormat = bundleConfig.format or "esm";
bundleBanner = bundleConfig.banner or nodeRequireBanner;
bundleAliases = bundleConfig.aliases or {
"@automerge/automerge" = "./node_modules/@automerge/automerge/dist/mjs/entrypoints/fullfat_base64.js";
bundleAliases =
bundleConfig.aliases or {
"@automerge/automerge" =
"./node_modules/@automerge/automerge/dist/mjs/entrypoints/fullfat_base64.js";
};
bundleAliasArgs = lib.concatStringsSep " " (
lib.mapAttrsToList
(from: to: "--alias:${from}=${lib.escapeShellArg to}")
bundleAliases
lib.mapAttrsToList (from: to: "--alias:${from}=${lib.escapeShellArg to}") bundleAliases
);
nodeRequireBanner = "import { createRequire } from 'module';const require = createRequire(import.meta.url);";
bundleCommand =
if bundle == null
then ""
else ''
if bundle == null then
""
else if bundleConfig.browserSources or false then
''
${nodejs}/bin/node ${./browser-source.mjs} ${
lib.escapeShellArg (
builtins.toJSON {
entryPoints = [ bundleConfig.entry ];
bundle = true;
platform = bundlePlatform;
target = bundleTarget;
format = bundleFormat;
alias = bundleAliases;
preserveSymlinks = bundleConfig.preserveSymlinks or true;
banner.js = bundleBanner;
outfile = bundleOutfile;
}
)
}
''
else
''
esbuild ${lib.escapeShellArg bundleConfig.entry} \
--bundle \
--platform=${bundlePlatform} \
@@ -644,26 +711,29 @@ EOF
serverFile = installConfig.serverFile or bundleOutfile;
descriptorPath = installConfig.descriptorPath or "descriptor.quixos-package.txtpb";
extraFiles = installConfig.extraFiles or [ ];
installExtraFile = file:
installExtraFile =
file:
let
source = toString file.source;
target = file.target or (baseNameOf source);
mode = file.mode or "0644";
in ''
in
''
install -Dm${toString mode} ${lib.escapeShellArg source} "$out/libexec/${serverLibexecName}/${target}"
'';
installServerPhase =
if installServer == null
then null
else ''
if installServer == null then
null
else
''
runHook preInstall
install -Dm755 ${lib.escapeShellArg serverFile} "$out/libexec/${serverLibexecName}/${serverFile}"
${lib.concatMapStringsSep "\n" installExtraFile extraFiles}
mkdir -p "$out/bin"
cat > "$out/bin/${serverBin}" <<EOF
#!${pkgs.runtimeShell}
exec ${nodejs}/bin/node "$out/libexec/${serverLibexecName}/${serverFile}" "\$@"
EOF
#!${pkgs.runtimeShell}
exec ${nodejs}/bin/node "$out/libexec/${serverLibexecName}/${serverFile}" "\$@"
EOF
chmod +x "$out/bin/${serverBin}"
${lib.optionalString (installConfig ? descriptorPath && descriptorPath != null) ''
cp ${lib.escapeShellArg descriptorPath} "$out/${descriptorPath}"
@@ -674,9 +744,9 @@ EOF
${lib.optionalString (migrationEntrypoint != null) ''
install -Dm444 migration.mjs "$out/libexec/${serverLibexecName}/migration.mjs"
cat > "$out/bin/migrate" <<EOF
#!${pkgs.runtimeShell}
exec ${nodejs}/bin/node --max-old-space-size=256 "$out/libexec/${serverLibexecName}/migration.mjs" "\$@"
EOF
#!${pkgs.runtimeShell}
exec ${nodejs}/bin/node --max-old-space-size=256 "$out/libexec/${serverLibexecName}/migration.mjs" "\$@"
EOF
chmod +x "$out/bin/migrate"
''}
runHook postInstall
@@ -684,7 +754,9 @@ EOF
project = (pkgs.callPackage "${packageRoot}/yarn-project.nix" { inherit nodejs; }) {
src = packageRoot;
overrideAttrs = old: {
overrideAttrs =
old:
{
nativeBuildInputs =
(old.nativeBuildInputs or [ ])
++ lib.optional (bundle != null || migrationEntrypoint != null) pkgs.esbuild
@@ -693,8 +765,13 @@ EOF
runHook preBuild
${exportsFor (callOption buildEnv)}
${bindingCommand}
${lib.optionalString (
bindingConfig != null && bundle != null
) "${bindingConfig.generator}/bin/quixos-qx bundle-policy src"}
${lib.optionalString (bindingConfig != null) "yarn exec tsc --noEmit"}
${lib.optionalString (bindingConfig != null) "cp ${lib.escapeShellArg bindingOutput} .qx-checked-bindings"}
${lib.optionalString (
bindingConfig != null
) "cp ${lib.escapeShellArg bindingOutput} .qx-checked-bindings"}
${buildCommand}
${lib.optionalString (bindingConfig != null) ''
yarn exec tsc --noEmit
@@ -709,7 +786,8 @@ EOF
''}
runHook postBuild
'';
} // lib.optionalAttrs (installServerPhase != null) {
}
// lib.optionalAttrs (installServerPhase != null) {
installPhase = installServerPhase;
};
};
@@ -725,9 +803,10 @@ EOF
'';
maybeServerOutputs =
if installServer == null
then { }
else {
if installServer == null then
{ }
else
{
packages.server = project;
apps.default = {
type = "app";
@@ -742,16 +821,26 @@ EOF
packages = [
nodejs
project.yarn-freestanding
] ++ lib.optional (bindingConfig != null) generateBindings ++ callOption devShellPackages;
]
++ lib.optional (bindingConfig != null) generateBindings
++ callOption devShellPackages;
# Explicit command keeps shell entry free of source mutations.
shellHook = devShellHookBase + callOption devShellHook;
};
} // maybeServerOutputs;
in (outputsFor null) // {
}
// maybeServerOutputs;
in
(outputsFor null)
// {
# The workspace supplies a compiler-produced schema for the exact
# candidate graph. Standalone builds may use checked-in authoring types,
# but only this build path regenerates and witnesses candidate contracts.
quixosPackages.checkedServer = { schema, generator, packageRevisionId }:
quixosPackages.checkedServer =
{
schema,
generator,
packageRevisionId,
}:
(outputsFor { inherit schema generator packageRevisionId; }).packages.server;
}
);
@@ -763,5 +852,6 @@ in
mkSchemaSupport
mkCaminoSourcePackage
mkQxBindingSchema
mkCaminoTsYarnNixifyFlake;
mkCaminoTsYarnNixifyFlake
;
}