@ogygie/cli 0.5.2 → 0.5.4

package/dist/cli.js

@@ -14963,16 +14963,21 @@ function initProject(deps, productName2) {
 }
 
 // src/commands/studio.ts
+import { createRequire } from "node:module";
+import { join as join4 } from "node:path";
+import { pathToFileURL } from "node:url";
 var PUBLISHED_STUDIO_SERVER = "@ogygie/studio/server";
-async function loadPublishedStudio() {
-  return await import(PUBLISHED_STUDIO_SERVER);
+async function loadStudioFrom(projectRoot) {
+  const resolveFromProject = createRequire(join4(projectRoot, "package.json"));
+  const entryPoint = resolveFromProject.resolve(PUBLISHED_STUDIO_SERVER);
+  return await import(pathToFileURL(entryPoint).href);
 }
 function isModuleNotFound(thrown) {
   const code = thrown?.code;
   return code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || typeof thrown === "object" && thrown !== null && thrown instanceof Error && /Cannot find (package|module)/i.test(thrown.message);
 }
 async function runStudio(deps) {
-  const importStudio = deps.importStudio ?? loadPublishedStudio;
+  const importStudio = deps.importStudio ?? (() => loadStudioFrom(deps.projectRoot));
   let studioServer;
   try {
     studioServer = await importStudio();
@@ -15003,7 +15008,7 @@ async function runStudio(deps) {
 
 // src/commands/upgrade.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname2, join as join4 } from "node:path";
+import { dirname as dirname2, join as join5 } from "node:path";
 
 // src/diff.ts
 function diffLines(oldText, newText) {
@@ -15071,7 +15076,7 @@ function compareVersions(a, b) {
 
 // src/commands/upgrade.ts
 function reportMissingGates(deps) {
-  const packageJsonPath = join4(deps.projectRoot, "package.json");
+  const packageJsonPath = join5(deps.projectRoot, "package.json");
   if (!existsSync4(packageJsonPath)) return;
   let scripts;
   try {
@@ -15126,7 +15131,7 @@ async function upgradeProject(deps) {
   for (const governed of governedFiles) {
     const expected = installedChecksums[governed.targetPath];
     if (expected === void 0) continue;
-    const absolutePath = join4(deps.projectRoot, governed.targetPath);
+    const absolutePath = join5(deps.projectRoot, governed.targetPath);
     const actual = existsSync4(absolutePath) ? sha256Hex(readFileSync4(absolutePath, "utf8")) : "<absent>";
     if (actual !== expected) {
       throwOgygieError({
@@ -15142,10 +15147,10 @@ async function upgradeProject(deps) {
   const diffBlocks = [];
   for (const governed of governedFiles) {
     const content = readFileSync4(
-      join4(deps.templatesDir, governed.templatePath),
+      join5(deps.templatesDir, governed.templatePath),
       "utf8"
     );
-    const absolutePath = join4(deps.projectRoot, governed.targetPath);
+    const absolutePath = join5(deps.projectRoot, governed.targetPath);
     const current = existsSync4(absolutePath) ? readFileSync4(absolutePath, "utf8") : "";
     const diff = diffLines(current, content);
     if (diff !== "") {
@@ -15166,7 +15171,7 @@ ${diff}`);
       };
     }
     for (const write of plannedWrites) {
-      const absolutePath = join4(deps.projectRoot, write.targetPath);
+      const absolutePath = join5(deps.projectRoot, write.targetPath);
       mkdirSync2(dirname2(absolutePath), { recursive: true });
       writeFileSync3(absolutePath, write.content);
     }
@@ -15188,7 +15193,7 @@ ${diff}`);
 
 // src/commands/verify-vocabulary.ts
 import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
-import { join as join5, relative, sep } from "node:path";
+import { join as join6, relative, sep } from "node:path";
 
 // ../ogygie-core/src/vocabulary.ts
 var TOKEN_PATTERN = new RegExp("\\p{L}[\\p{L}\\p{N}]*(?:[-_$][\\p{L}\\p{N}]+)*", "gu");
@@ -15237,9 +15242,20 @@ function findProductVocabulary(sourceText, vocabularyRoots) {
   return matches;
 }
 function stripComments(sourceText) {
-  const blankKeepingNewlines = (text) => text.replace(/[^\n]/g, " ");
   return sourceText.replace(/\/\*[\s\S]*?\*\//g, blankKeepingNewlines).replace(/\/\/[^\n]*/g, blankKeepingNewlines);
 }
+function blankKeepingNewlines(text) {
+  return text.replace(/[^\n]/g, " ");
+}
+var MACHINE_STRING_CONTENT = /^[A-Za-z0-9_$\-./:@]+$/;
+function stripProseStrings(sourceText) {
+  const blankProse = (literal2) => {
+    const content = literal2.slice(1, -1);
+    if (MACHINE_STRING_CONTENT.test(content)) return literal2;
+    return literal2[0] + blankKeepingNewlines(content) + literal2[literal2.length - 1];
+  };
+  return sourceText.replace(/`(?:[^`\\]|\\[\s\S])*`/g, blankProse).replace(/"(?:[^"\\\n]|\\.)*"/g, blankProse).replace(/'(?:[^'\\\n]|\\.)*'/g, blankProse);
+}
 
 // ../ogygie-core/src/vocabulary-audit.ts
 function canonicalByAlias(vocabulary) {
@@ -15257,7 +15273,8 @@ function auditProductVocabulary(input) {
   const canonicalTerms = vocabulary.entries.map((entry) => entry.canonical);
   const violations = [];
   for (const file2 of input.sourceFiles) {
-    for (const match of findProductVocabulary(stripComments(file2.content), forbiddenAliases)) {
+    const judged = stripProseStrings(stripComments(file2.content));
+    for (const match of findProductVocabulary(judged, forbiddenAliases)) {
       violations.push({
         kind: "FORBIDDEN_ALIAS",
         filePath: file2.path,
@@ -15283,7 +15300,7 @@ function auditProductVocabulary(input) {
 var CODE_EXTENSIONS = [".ts", ".tsx", ".mts", ".mjs", ".js", ".jsx"];
 var IGNORED_DIRS = /* @__PURE__ */ new Set(["node_modules", "dist", "build", ".git", "coverage"]);
 function readManifest(projectRoot) {
-  const manifestPath = join5(projectRoot, MANIFEST_FILE_NAME);
+  const manifestPath = join6(projectRoot, MANIFEST_FILE_NAME);
   if (!existsSync5(manifestPath)) {
     throwOgygieError({
       code: "OGYGIE_CLI_USAGE",
@@ -15308,13 +15325,13 @@ function readManifest(projectRoot) {
   return parsed.data;
 }
 function collectCodeFiles(projectRoot, folder) {
-  const absoluteFolder = join5(projectRoot, folder);
+  const absoluteFolder = join6(projectRoot, folder);
   if (!existsSync5(absoluteFolder)) return [];
   const files = [];
   const walk = (directory) => {
     for (const entry of readdirSync2(directory)) {
       if (IGNORED_DIRS.has(entry)) continue;
-      const entryPath = join5(directory, entry);
+      const entryPath = join6(directory, entry);
       if (statSync2(entryPath).isDirectory()) {
         walk(entryPath);
         continue;
@@ -15350,9 +15367,9 @@ function verifyVocabulary(deps) {
   const sourceFiles = productCodeFoldersOf(manifest).flatMap(
     (folder) => collectCodeFiles(deps.projectRoot, folder)
   );
-  const governed = governedFiles.filter((file2) => existsSync5(join5(deps.projectRoot, file2.targetPath))).map((file2) => ({
+  const governed = governedFiles.filter((file2) => existsSync5(join6(deps.projectRoot, file2.targetPath))).map((file2) => ({
     path: file2.targetPath,
-    content: readFileSync5(join5(deps.projectRoot, file2.targetPath), "utf8")
+    content: readFileSync5(join6(deps.projectRoot, file2.targetPath), "utf8")
   }));
   return auditProductVocabulary({
     vocabulary: manifest.vocabulary,
@@ -15418,27 +15435,39 @@ var governedChecksumsByVersion = {
     "AGENTS.md": "c7d51a0cd97b67343b486bdb7c54914da68d96409eaa985959d2a525c65549fd",
     "CLAUDE.md": "785ee8d90e368806d8cf0b4d84a15f29d1dc961168bda86cf1a6c60a923c8c9b",
     "tsconfig.base.json": "0f8919e9ed8bbc88e0308fa2fa91471dabb18d1df721bd78c04076597eba89a2"
+  },
+  "0.5.3": {
+    ".github/workflows/ogygie-gates.yml": "48c40efe9fe66dd0f9c3b94287026d80eae9afd6782b5833fdf8846d8662babf",
+    "AGENTS.md": "c7d51a0cd97b67343b486bdb7c54914da68d96409eaa985959d2a525c65549fd",
+    "CLAUDE.md": "785ee8d90e368806d8cf0b4d84a15f29d1dc961168bda86cf1a6c60a923c8c9b",
+    "tsconfig.base.json": "0f8919e9ed8bbc88e0308fa2fa91471dabb18d1df721bd78c04076597eba89a2"
+  },
+  "0.5.4": {
+    ".github/workflows/ogygie-gates.yml": "48c40efe9fe66dd0f9c3b94287026d80eae9afd6782b5833fdf8846d8662babf",
+    "AGENTS.md": "c7d51a0cd97b67343b486bdb7c54914da68d96409eaa985959d2a525c65549fd",
+    "CLAUDE.md": "785ee8d90e368806d8cf0b4d84a15f29d1dc961168bda86cf1a6c60a923c8c9b",
+    "tsconfig.base.json": "0f8919e9ed8bbc88e0308fa2fa91471dabb18d1df721bd78c04076597eba89a2"
   }
 };
 
 // src/paths.ts
 import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
-import { dirname as dirname3, join as join6 } from "node:path";
+import { dirname as dirname3, join as join7 } from "node:path";
 import { fileURLToPath } from "node:url";
-var PACKAGE_ROOT = join6(dirname3(fileURLToPath(import.meta.url)), "..");
+var PACKAGE_ROOT = join7(dirname3(fileURLToPath(import.meta.url)), "..");
 var PackageVersionSchema2 = external_exports.object({ version: external_exports.string() });
 function cliVersion() {
   return PackageVersionSchema2.parse(
-    JSON.parse(readFileSync6(join6(PACKAGE_ROOT, "package.json"), "utf8"))
+    JSON.parse(readFileSync6(join7(PACKAGE_ROOT, "package.json"), "utf8"))
   ).version;
 }
 function templatesDir() {
-  const embedded = join6(PACKAGE_ROOT, "templates");
+  const embedded = join7(PACKAGE_ROOT, "templates");
   if (existsSync6(embedded)) return embedded;
   return repoTemplatesDir();
 }
 function repoTemplatesDir() {
-  return join6(PACKAGE_ROOT, "..", "..", "templates");
+  return join7(PACKAGE_ROOT, "..", "..", "templates");
 }
 
 // src/cli.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogygie/cli",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Ogygie framework CLI: deterministic scaffolding (init), governed-file upgrades (upgrade) and lockstep verification (check) for Ogygie products.",
   "license": "MIT",
   "type": "module",
@@ -22,7 +22,7 @@
     "tsx": "^4.20.0",
     "typescript": "^5.8.0",
     "zod": "^4.0.0",
-    "@ogygie/core": "0.5.2"
+    "@ogygie/core": "0.5.4"
   },
   "scripts": {
     "typecheck": "tsc -p tsconfig.json",