@patterkit/ops 0.7.2 → 0.7.3

package/dist/index.js

@@ -226,6 +226,7 @@ function applyWrites(writes) {
 
 // src/validate.ts
 import { readFileSync as readFileSync2, statSync as statSync2 } from "fs";
+import { basename as basename2, isAbsolute, join as join2, relative } from "path";
 
 // src/merge.ts
 import { canonicalStringify } from "@patterkit/core";
@@ -846,23 +847,24 @@ function runValidate(loaded) {
   };
 }
 function orphanShards(loaded) {
-  const collected = /* @__PURE__ */ new Set([
-    loaded.projectFile,
-    ...Object.values(loaded.sceneFiles),
-    ...loaded.localeFiles,
-    ...loaded.authoringFiles
-  ]);
+  const layout = { flow: "scenes/", strings: "loc/", authoring: "authoring/", ...loaded.project.layout };
   const kind = {
-    ".patterflow": "scene",
-    ".patterloc": "locale",
-    ".patterx": "authoring",
-    ".patterproj": "project"
+    ".patterflow": { what: "scene", home: layout.flow },
+    ".patterloc": { what: "strings", home: layout.strings },
+    ".patterx": { what: "authoring", home: layout.authoring },
+    ".patterproj": { what: "project", home: null }
+  };
+  const inside = (file, dir) => {
+    const r = relative(dir, file);
+    return r !== "" && !r.startsWith("..") && !isAbsolute(r);
   };
   const out = [];
-  for (const [ext, what] of Object.entries(kind)) {
+  for (const [ext, { what, home }] of Object.entries(kind)) {
     for (const file of walkFiles(loaded.root, ext)) {
-      if (collected.has(file)) continue;
-      out.push({ file, message: `a ${what} shard outside the project's layout - nothing loads it, so its content is not in the project (move it under the configured folder, or delete it)` });
+      if (home ? inside(file, join2(loaded.root, home)) : file === loaded.projectFile) continue;
+      const rel = relative(loaded.root, file);
+      const message = home ? `${rel} is a ${what} file outside the project's folders: nothing loads it, so none of it is in the project. Move it under ${home}, or delete it.` : `${rel} is a second project file: only ${basename2(loaded.projectFile)} is read. Delete it, or move it out of the project.`;
+      out.push({ file, message });
     }
   }
   return out;
@@ -926,7 +928,7 @@ function checkHygiene(files) {
 }
 
 // src/export.ts
-import { basename as basename2, isAbsolute, join as join2 } from "path";
+import { basename as basename3, isAbsolute as isAbsolute2, join as join3 } from "path";
 import { exportBundle as exportBundle3 } from "@patterkit/compiler";
 import { isContentlessBeat } from "@patterkit/model";
 function compileScenes(loaded) {
@@ -972,9 +974,9 @@ function runExportFull(loaded) {
 }
 function bundleOutputPath(loaded) {
   const override = loaded.project.export?.bundle;
-  if (override) return isAbsolute(override) ? override : join2(loaded.root, override);
-  const stem = basename2(loaded.projectFile).replace(/\.patterproj$/, "");
-  return join2(loaded.root, "dist", `${stem}.patterc`);
+  if (override) return isAbsolute2(override) ? override : join3(loaded.root, override);
+  const stem = basename3(loaded.projectFile).replace(/\.patterproj$/, "");
+  return join3(loaded.root, "dist", `${stem}.patterc`);
 }
 
 // src/export-html.ts
@@ -1179,7 +1181,7 @@ ${PLAYER_JS}`,
 
 // src/audio-scan.ts
 import { readdirSync as readdirSync2 } from "fs";
-import { resolve as resolve2, extname, basename as basename3 } from "path";
+import { resolve as resolve2, extname, basename as basename4 } from "path";
 import { deriveRecordingFolders, DEFAULT_RECORDING_STATUSES } from "@patterkit/model";
 var AUDIO_EXT = /* @__PURE__ */ new Set([".wav", ".mp3"]);
 function scanAudioStatus(loaded) {
@@ -1198,7 +1200,7 @@ function scanAudioStatus(loaded) {
     }
     for (const f of files) {
       const ext = extname(f).toLowerCase();
-      if (AUDIO_EXT.has(ext)) out.set(basename3(f, extname(f)), rung.name);
+      if (AUDIO_EXT.has(ext)) out.set(basename4(f, extname(f)), rung.name);
     }
   }
   return out;
@@ -2092,7 +2094,7 @@ async function runReportXlsx(data) {
 }
 
 // src/localisation.ts
-import { basename as basename4, join as join3, sep } from "path";
+import { basename as basename5, join as join4, sep } from "path";
 import { canonicalStringify as canonicalStringify4 } from "@patterkit/core";
 import { walkNodes as walkNodes3, castStringKey, PROJECT_LOCALE_SCENE } from "@patterkit/model";
 
@@ -2214,14 +2216,14 @@ function targetLocPath(loaded, scene, locale, defaultLocale) {
     }
   }
   const stem = scene === PROJECT_LOCALE_SCENE ? "_project" : scene;
-  return join3(loaded.root, layoutOf(loaded).strings, locale, `${stem}.patterloc`);
+  return join4(loaded.root, layoutOf(loaded).strings, locale, `${stem}.patterloc`);
 }
 function authoringPath(loaded, scene) {
-  const dir = join3(loaded.root, layoutOf(loaded).authoring);
-  if (scene === PROJECT_LOCALE_SCENE) return join3(dir, "_project.patterx");
+  const dir = join4(loaded.root, layoutOf(loaded).authoring);
+  if (scene === PROJECT_LOCALE_SCENE) return join4(dir, "_project.patterx");
   const flow = loaded.sceneFiles[scene];
-  const stem = flow ? basename4(flow).replace(/\.patterflow$/, "") : scene;
-  return join3(dir, `${stem}.patterx`);
+  const stem = flow ? basename5(flow).replace(/\.patterflow$/, "") : scene;
+  return join4(dir, `${stem}.patterx`);
 }
 var findFile = (files, items, path) => {
   const i = files.indexOf(path);
@@ -3069,12 +3071,12 @@ async function scriptToPdf(doc) {
 }
 
 // src/init.ts
-import { join as join4, basename as basename5, resolve as resolve3 } from "path";
+import { join as join5, basename as basename6, resolve as resolve3 } from "path";
 import { readdirSync as readdirSync3, existsSync as existsSync2 } from "fs";
 import { newId, slug, canonicalStringify as canonicalStringify5 } from "@patterkit/core";
 function runInit(opts) {
   const dir = resolve3(opts.dir);
-  const name = opts.name?.trim() || basename5(dir).replace(/\.patter$/, "");
+  const name = opts.name?.trim() || basename6(dir).replace(/\.patter$/, "");
   const fileSlug = slug(name);
   let existing = [];
   try {
@@ -3122,12 +3124,12 @@ function runInit(opts) {
     strings: { [beatId]: `Welcome to ${name}. This is the first line of your story - replace it with your own.` }
   };
   const bundle = opts.bundle ?? "commit";
-  const projectFile = join4(dir, `${fileSlug}.patterproj`);
+  const projectFile = join5(dir, `${fileSlug}.patterproj`);
   const writes = [
     { path: projectFile, content: canonicalStringify5(project) },
-    { path: join4(dir, "scenes", "start.patterflow"), content: canonicalStringify5(flow) },
-    { path: join4(dir, "loc", "en", "start.patterloc"), content: canonicalStringify5(locale) },
-    { path: join4(dir, ".editorconfig"), content: EDITORCONFIG },
+    { path: join5(dir, "scenes", "start.patterflow"), content: canonicalStringify5(flow) },
+    { path: join5(dir, "loc", "en", "start.patterloc"), content: canonicalStringify5(locale) },
+    { path: join5(dir, ".editorconfig"), content: EDITORCONFIG },
     ...vcsConfigWrites(dir, opts.vcs, bundle)
   ];
   const collisions = writes.map((w) => w.path).filter((p) => existsSync2(p));
@@ -3137,10 +3139,10 @@ function runInit(opts) {
   return { writes, projectFile, name };
 }
 function vcsConfigWrites(dir, vcs, bundle = "commit") {
-  const writes = [{ path: join4(dir, "vcs-setup.md"), content: vcsSetup(vcs, bundle) }];
-  if (vcs === "git") writes.push({ path: join4(dir, ".gitattributes"), content: GITATTRIBUTES });
+  const writes = [{ path: join5(dir, "vcs-setup.md"), content: vcsSetup(vcs, bundle) }];
+  if (vcs === "git") writes.push({ path: join5(dir, ".gitattributes"), content: GITATTRIBUTES });
   const ignore = ignoreFileFor(vcs);
-  if (ignore) writes.push({ path: join4(dir, ignore), content: ignoreContent(bundle) });
+  if (ignore) writes.push({ path: join5(dir, ignore), content: ignoreContent(bundle) });
   return writes;
 }
 var EDITORCONFIG = `# Patter projects are UTF-8 + LF, always (spec - patter format enforces this).
@@ -3615,7 +3617,7 @@ function runReplace(loaded, opts) {
 // src/pack.ts
 import JSZip from "jszip";
 import { readFileSync as readFileSync4 } from "fs";
-import { dirname as dirname4, relative, sep as sep2 } from "path";
+import { dirname as dirname4, relative as relative2, sep as sep2 } from "path";
 import { parseSource as parseSource4 } from "@patterkit/core";
 import { ARCHIVE_ENTRY_OPTS } from "@wildwinter/toolkit/archive";
 var SHARD_EXTENSIONS = [".patterflow", ".patterloc", ".patterx", ".patterproj"];
@@ -3631,7 +3633,7 @@ async function runPack(startPath) {
 ` + unresolved.map((i) => `  ${i.file}`).join("\n")
     );
   }
-  const files = SHARD_EXTENSIONS.flatMap((ext) => walkFiles(root, ext)).map((abs) => ({ abs, rel: relative(root, abs).split(sep2).join("/") })).sort((a, b) => a.rel.localeCompare(b.rel));
+  const files = SHARD_EXTENSIONS.flatMap((ext) => walkFiles(root, ext)).map((abs) => ({ abs, rel: relative2(root, abs).split(sep2).join("/") })).sort((a, b) => a.rel.localeCompare(b.rel));
   const manifest = {
     schema: "patter/document@0",
     project: { id: project.project.id, name: project.project.name },
@@ -3645,7 +3647,7 @@ async function runPack(startPath) {
 
 // src/unpack.ts
 import JSZip2 from "jszip";
-import { join as join5, resolve as resolve4, sep as sep3 } from "path";
+import { join as join6, resolve as resolve4, sep as sep3 } from "path";
 import { existsSync as existsSync3, readFileSync as readFileSync5 } from "fs";
 import { parseSource as parseSource5, canonicalStringify as canonicalStringify7 } from "@patterkit/core";
 import { isUnsafeEntry } from "@wildwinter/toolkit/archive";
@@ -3736,7 +3738,7 @@ async function runUnpackMerge(returnedBytes, baseBytes, projectDir) {
 }
 function containedWrite(dir, name) {
   const root = resolve4(dir);
-  const full = resolve4(join5(dir, name));
+  const full = resolve4(join6(dir, name));
   if (full !== root && !full.startsWith(root + sep3)) {
     throw new UnsafeEntryError(`document entry escapes the target directory: ${name}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patterkit/ops",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "The shared operations layer: every project operation (load, validate, export, format, play, ...) as a pure function, consumed by the patter CLI and Patterpad alike.",
   "type": "module",
   "license": "MIT",