@intentius/chant-lexicon-k3s 0.124.30 → 0.124.32

package/dist/spec/fetch.js

@@ -0,0 +1,72 @@
+/**
+ * k3s CLI flag-definition fetching — downloads the pinned Go sources that
+ * define the server and agent flag surfaces, and caches them locally.
+ *
+ * k3s publishes no JSON Schema for config.yaml. The config file's keys ARE
+ * the CLI flag names ("Every flag can be a config key", docs.k3s.io), and
+ * the flags are defined as urfave/cli struct literals in pkg/cli/cmds/.
+ * Those literals carry name, usage, default and hidden-ness, so the tagged
+ * source tree is the machine-readable spec (#1599) — the same channel the
+ * k3s binary itself is built from, pinned the same way k3d pins its
+ * schema.json.
+ */
+import { join } from "path";
+import { homedir } from "os";
+import { fetchWithCache, clearCacheFile } from "@intentius/chant/codegen/fetch";
+/**
+ * Pinned upstream k3s release.
+ *
+ * Bump this constant (and re-generate) when adopting a newer k3s release.
+ * The acceptance test's rancher/k3s image tag derives from it (`+` → `-`).
+ */
+export const K3S_VERSION = "v1.36.3+k3s1";
+/** Docker image tag form of the pin: `+` is not legal in a tag. */
+export const K3S_IMAGE_TAG = K3S_VERSION.replace("+", "-");
+/**
+ * The files that define flags reachable from the server and agent flag
+ * lists. server.go owns ServerFlags; agent.go owns the agent command's
+ * flags plus the shared node/token flag vars; config.go, root.go and
+ * log.go define the shared vars both lists reference (ConfigFlag,
+ * DebugFlag, VLevel, LogFile, ...).
+ */
+const SPEC_FILES = ["server.go", "agent.go", "config.go", "root.go", "log.go"];
+function rawUrl(file) {
+    // '+' must be percent-encoded in the raw.githubusercontent path.
+    const tag = encodeURIComponent(K3S_VERSION);
+    return `https://raw.githubusercontent.com/k3s-io/k3s/${tag}/pkg/cli/cmds/${file}`;
+}
+function cachePath(file) {
+    return join(homedir(), ".chant", `k3s-${K3S_VERSION}-${file}`);
+}
+/**
+ * Fetch all pinned spec files, keyed by filename.
+ */
+export async function fetchSpecFiles(force) {
+    const files = {};
+    for (const file of SPEC_FILES) {
+        const data = await fetchWithCache({ url: rawUrl(file), cacheFile: cachePath(file) }, force);
+        files[file] = data.toString("utf-8");
+    }
+    return files;
+}
+/**
+ * Fetch the spec as a Map<typeName, Buffer> compatible with the
+ * generatePipeline fetchSchemas callback.
+ *
+ * Single entry keyed "K3s::Config" whose buffer is a JSON envelope of the
+ * fetched files — the parse step needs them together to resolve flag-var
+ * references across files.
+ */
+export async function fetchSchemas(force) {
+    const files = await fetchSpecFiles(force);
+    const schemas = new Map();
+    schemas.set("K3s::Config", Buffer.from(JSON.stringify(files), "utf-8"));
+    return schemas;
+}
+/**
+ * Clear the cached spec files.
+ */
+export function clearCache() {
+    for (const file of SPEC_FILES)
+        clearCacheFile(cachePath(file));
+}

package/dist/validate-cli.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env tsx
+import { validate } from "./validate.js";
+// `validate` takes an optional { basePath }; defaults to the lexicon root.
+await validate();

package/dist/validate.js

@@ -0,0 +1,35 @@
+/**
+ * Validate generated lexicon-k3s artifacts.
+ *
+ * Thin wrapper around the core validation framework
+ * with k3s-specific configuration.
+ */
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+import { validateLexiconArtifacts } from "@intentius/chant/codegen/validate";
+/**
+ * Every entity class, plus load-bearing config keys whose disappearance
+ * from a regeneration would mean the parser silently lost part of the
+ * flag surface (#1599): the join/identity block, the etcd S3 keys the
+ * lint layer references, and one representative per flag type.
+ */
+const REQUIRED_NAMES = [
+    "Server",
+    "Agent",
+    "Registries",
+    "Mirror",
+    "RegistryConfig",
+    "RegistryAuth",
+    "RegistryTLS",
+];
+/**
+ * Validate the generated lexicon-k3s artifacts.
+ */
+export async function validate(opts) {
+    const basePath = opts?.basePath ?? dirname(dirname(fileURLToPath(import.meta.url)));
+    return validateLexiconArtifacts({
+        lexiconJsonFilename: "lexicon-k3s.json",
+        requiredNames: REQUIRED_NAMES,
+        basePath,
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-k3s",
-  "version": "0.124.30",
+  "version": "0.124.32",
   "type": "module",
   "files": [
     "src/",
@@ -10,22 +10,22 @@
     ".": {
       "development": "./src/index.ts",
       "types": "./dist/index.d.ts",
-      "default": "./src/index.ts"
+      "default": "./dist/index.js"
     },
     "./*": {
       "development": "./src/*.ts",
       "types": "./dist/*.d.ts",
-      "default": "./src/*.ts"
+      "default": "./dist/*.js"
     },
     "./op/activities": {
       "development": "./src/op/activities/index.ts",
       "types": "./dist/op/activities/index.d.ts",
-      "default": "./src/op/activities/index.ts"
+      "default": "./dist/op/activities/index.js"
     },
     "./lint/post-synth": {
       "development": "./src/lint/post-synth/index.ts",
       "types": "./dist/lint/post-synth/index.d.ts",
-      "default": "./src/lint/post-synth/index.ts"
+      "default": "./dist/lint/post-synth/index.js"
     },
     "./manifest": "./dist/manifest.json",
     "./meta": "./dist/meta.json",
@@ -35,7 +35,7 @@
     "generate": "npx tsx src/codegen/generate-cli.ts",
     "validate": "npx tsx src/validate-cli.ts",
     "docs": "npx tsx src/codegen/docs-cli.ts",
-    "build": "../../scripts/tsc7.sh -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && find dist -type f \\( -name \"*.js\" -o -name \"*.js.map\" \\) -delete",
+    "build": "../../scripts/tsc7.sh -p tsconfig.build.json --sourceMap false && tsc-alias -p tsconfig.build.json",
     "prepack": "npm run generate && npm run bundle && npm run validate && npm run build",
     "bundle": "tsx src/package-cli.ts"
   },
@@ -50,7 +50,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.124.30"
+    "@intentius/chant": "^0.124.32"
   },
   "description": "k3s lexicon for chant — the k3s distro's host configuration as declarable data",
   "license": "Apache-2.0",

package/src/codegen/package.ts

@@ -3,13 +3,13 @@ import type { PackagePipelineConfig } from "@intentius/chant/codegen/package";
 import { k3sPlugin } from "../plugin";
 import { generate } from "./generate";
 import { dirname } from "path";
-import { fileURLToPath } from "url";
+import { moduleSourceDir } from "@intentius/chant/module-source";
 
 /**
  * Package the k3s lexicon for distribution.
  */
 export async function packageLexicon(options?: { verbose?: boolean; force?: boolean }) {
-  const srcDir = dirname(fileURLToPath(import.meta.url));
+  const srcDir = moduleSourceDir(import.meta.url);
 
   const { spec, stats } = await packagePipeline({
     generate: (opts) => generate({ verbose: opts?.verbose, force: opts?.force }),

package/src/lsp/completions.ts

@@ -1,11 +1,12 @@
 import { createRequire } from "module";
+import { moduleSourceUrl } from "@intentius/chant/module-source";
 import type { CompletionContext, CompletionItem } from "@intentius/chant/lsp/types";
 import {
   LexiconIndex,
   lexiconCompletions,
   type LexiconEntry,
 } from "@intentius/chant/lsp/lexicon-providers";
-const require = createRequire(import.meta.url);
+const require = createRequire(moduleSourceUrl(import.meta.url));
 
 let cachedIndex: LexiconIndex | null = null;
 

package/src/lsp/hover.ts

@@ -1,11 +1,12 @@
 import { createRequire } from "module";
+import { moduleSourceUrl } from "@intentius/chant/module-source";
 import type { HoverContext, HoverInfo } from "@intentius/chant/lsp/types";
 import {
   LexiconIndex,
   lexiconHover,
   type LexiconEntry,
 } from "@intentius/chant/lsp/lexicon-providers";
-const require = createRequire(import.meta.url);
+const require = createRequire(moduleSourceUrl(import.meta.url));
 
 let cachedIndex: LexiconIndex | null = null;
 

package/src/plugin.ts

@@ -6,6 +6,7 @@ import type { McpToolContribution, McpResourceContribution } from "@intentius/ch
 import { readFileSync } from "fs";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
+import { moduleSourceDir } from "@intentius/chant/module-source";
 import { LABEL_OWNERSHIP_KEYS } from "@intentius/chant/ownership";
 import { k3sSerializer } from "./serializer";
 import { rules } from "./lint/rules";
@@ -99,7 +100,7 @@ export const k3sPlugin: LexiconPlugin = {
 
   skills() {
     const skills: SkillDefinition[] = [];
-    const dir = dirname(fileURLToPath(import.meta.url));
+    const dir = moduleSourceDir(import.meta.url);
     const entries = [
       {
         file: "chant-k3s.md",