npm - jostraca - Versions diffs - 0.31.0 → 0.31.2 - Mend

jostraca 0.31.0 → 0.31.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

package/README.md +355 -0
package/dist/build/BuildContext.d.ts +1 -0
package/dist/build/BuildContext.js +10 -0
package/dist/build/BuildContext.js.map +1 -1
package/dist/build/BuildMeta.js +21 -4
package/dist/build/BuildMeta.js.map +1 -1
package/dist/build/FileHandler.d.ts +11 -4
package/dist/build/FileHandler.js +468 -92
package/dist/build/FileHandler.js.map +1 -1
package/dist/cmp/Content.js.map +1 -1
package/dist/cmp/Copy.js +5 -1
package/dist/cmp/Copy.js.map +1 -1
package/dist/cmp/File.js +2 -0
package/dist/cmp/File.js.map +1 -1
package/dist/cmp/Folder.js.map +1 -1
package/dist/cmp/Fragment.js +36 -7
package/dist/cmp/Fragment.js.map +1 -1
package/dist/cmp/Inject.js +30 -1
package/dist/cmp/Inject.js.map +1 -1
package/dist/cmp/Line.js.map +1 -1
package/dist/cmp/List.js.map +1 -1
package/dist/cmp/None.js.map +1 -1
package/dist/cmp/Project.js.map +1 -1
package/dist/cmp/Slot.js.map +1 -1
package/dist/diff.d.ts +36 -0
package/dist/diff.js +446 -0
package/dist/diff.js.map +1 -0
package/dist/jostraca.d.ts +19 -18
package/dist/jostraca.js +83 -24
package/dist/jostraca.js.map +1 -1
package/dist/op/ContentOp.js.map +1 -1
package/dist/op/CopyOp.js +158 -22
package/dist/op/CopyOp.js.map +1 -1
package/dist/op/FileOp.js +26 -27
package/dist/op/FileOp.js.map +1 -1
package/dist/op/FolderOp.js +3 -0
package/dist/op/FolderOp.js.map +1 -1
package/dist/op/FragmentOp.js.map +1 -1
package/dist/op/InjectOp.js +29 -7
package/dist/op/InjectOp.js.map +1 -1
package/dist/op/NoneOp.js.map +1 -1
package/dist/op/ProjectOp.js.map +1 -1
package/dist/op/SlotOp.js.map +1 -1
package/dist/tsconfig.tsbuildinfo +1 -1
package/dist/types.d.ts +1 -0
package/dist/util/basic.d.ts +5 -1
package/dist/util/basic.js +218 -9
package/dist/util/basic.js.map +1 -1
package/dist/util/point.d.ts +8 -7
package/dist/util/point.js.map +1 -1
package/package.json +19 -11
package/src/build/BuildContext.ts +12 -0
package/src/build/BuildMeta.ts +24 -5
package/src/build/FileHandler.ts +489 -121
package/src/cmp/Copy.ts +5 -1
package/src/cmp/File.ts +3 -0
package/src/cmp/Fragment.ts +41 -7
package/src/cmp/Inject.ts +38 -1
package/src/diff.ts +657 -0
package/src/jostraca.ts +83 -20
package/src/op/CopyOp.ts +173 -22
package/src/op/FileOp.ts +29 -31
package/src/op/FolderOp.ts +6 -0
package/src/op/InjectOp.ts +39 -7
package/src/tsconfig.json +3 -1
package/src/types.ts +5 -0
package/src/util/basic.ts +250 -10

package/README.md ADDED Viewed

@@ -0,0 +1,355 @@
+# jostraca
+A code and project generator that uses React-style components to define
+files, folders, and content declaratively. This is the canonical
+TypeScript implementation, published to npm as
+[`jostraca`](https://www.npmjs.com/package/jostraca). (A feature-parity Go
+port lives at [`github.com/jostraca/jostraca/go`](https://pkg.go.dev/github.com/jostraca/jostraca/go).)
+[![npm version](https://badge.fury.io/js/jostraca.svg)](https://www.npmjs.com/package/jostraca)
+[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/jostraca/jostraca/blob/master/LICENSE)
+```bash
+npm install jostraca
+```
+Peer dependencies (install the ones your usage needs):
+```bash
+npm install memfs shape
+```
+`memfs` backs in-memory generation; `shape` backs option validation. Both
+are loose ranges (`memfs >=4`, `shape >=10`).
+---
+This README is organised along the four [Diátaxis](https://diataxis.fr)
+documentation modes. Jump to the one that fits what you need right now:
+- **[Tutorial](#tutorial)** — learning-oriented. Build your first
+  generator from scratch.
+- **[How-to guides](#how-to-guides)** — task-oriented. Recipes for
+  specific jobs.
+- **[Reference](#reference)** — information-oriented. Every component,
+  option, and utility.
+- **[Explanation](#explanation)** — understanding-oriented. How and why
+  Jostraca works the way it does.
+---
+## Tutorial
+*A short lesson. Follow it top to bottom and you'll have a working
+generator.*
+### 1. A first file tree
+Create a generator, then describe a tree of components. Nesting the
+components mirrors the folders and files you want on disk.
+```typescript
+import { Jostraca, Project, Folder, File, Content } from 'jostraca'
+const jostraca = Jostraca()
+await jostraca.generate({ folder: './out' }, () => {
+  Project({ folder: 'my-app' }, () => {
+    Folder({ name: 'src' }, () => {
+      File({ name: 'index.js' }, () => {
+        Content('console.log("hello world")\n')
+      })
+    })
+    File({ name: 'package.json' }, () => {
+      Content('{ "name": "my-app" }\n')
+    })
+  })
+})
+```
+Run it, and Jostraca writes:
+```
+out/
+  my-app/
+    src/
+      index.js       -> console.log("hello world")
+    package.json     -> { "name": "my-app" }
+```
+You declared a tree; Jostraca built it. That is the whole model.
+### 2. Insert values with a template
+Real generators produce files that vary with input data. Pass a `model`
+to `Jostraca()` and reference it in content with `$$path$$`:
+```typescript
+const jostraca = Jostraca({
+  model: { app: { name: 'Acme', version: '1.0.0' } }
+})
+await jostraca.generate({ folder: './out' }, () => {
+  Project({}, () => {
+    File({ name: 'config.txt' }, () => {
+      Content('App: $$app.name$$ v$$app.version$$\n')
+    })
+  })
+})
+// out/config.txt -> App: Acme v1.0.0
+```
+### 3. Make a reusable component
+When a shape repeats, capture it with `cmp()` — a plain function that
+emits content. This is the "React-style" part: components compose.
+```typescript
+import { cmp, Content, each } from 'jostraca'
+const FunctionDef = cmp(function FunctionDef(props: any) {
+  Content(`function ${props.name}(`)
+  Content(props.params.join(', '))
+  Content(') {\n')
+  each(props.ctx$.model.body, (line) => Content(`  ${line}\n`))
+  Content('}\n')
+})
+File({ name: 'utils.js' }, () => {
+  FunctionDef({ name: 'greet', params: ['name'] })
+})
+```
+From here, the **How-to guides** below cover each capability in turn, and
+the **Reference** documents every option.
+## How-to guides
+*Practical recipes. Each one is self-contained — read only the one you
+need.*
+### Read a template file and fill its slots
+Use `Fragment` to read an external template, and `Slot` to replace marked
+regions inside it.
+```typescript
+// template.html contains:
+// <html>
+// <!-- <[SLOT:head]> -->
+// <body>
+// <!-- <[SLOT:body]> -->
+// </body>
+// </html>
+File({ name: 'index.html' }, () => {
+  Fragment({ from: '/templates/template.html' }, () => {
+    Slot({ name: 'head' }, () => {
+      Content('<title>My Page</title>')
+    })
+    Slot({ name: 'body' }, () => {
+      Content('<h1>Hello</h1>')
+    })
+  })
+})
+```
+An unnamed `<[SLOT]>` marker receives all non-`Slot` children of the
+Fragment. Giving a Fragment non-`Slot` children when its source has no
+unnamed `<[SLOT]>` marker is an error — there is nowhere for that content
+to go, and it would otherwise be discarded silently.
+### Copy files and directories
+`Copy` brings in existing files or whole directory trees, applying
+template substitution to text files (binaries pass through untouched):
+```typescript
+const jostraca = Jostraca({ model: { title: 'My App' } })
+await jostraca.generate({ folder: './out' }, () => {
+  Project({ folder: 'app' }, () => {
+    Folder({ name: 'static' }, () => {
+      Copy({ from: '/templates/assets' })
+      Copy({ from: '/templates/readme.txt', to: 'README.txt' })
+    })
+  })
+})
+```
+### Edit an existing file in place
+`Inject` replaces the content between two markers in a file that already
+exists, leaving the rest untouched:
+```typescript
+// existing foo.txt:
+// HEADER
+// #--START--#
+// old content
+// #--END--#
+// FOOTER
+Project({}, () => {
+  Inject({ name: 'foo.txt' }, () => {
+    Content('new content')
+  })
+})
+// Result: HEADER\n#--START--#\nnew content\n#--END--#\nFOOTER
+```
+### Regenerate without clobbering hand edits
+By default Jostraca overwrites. When users edit generated files, choose a
+gentler mode per file extension:
+```typescript
+await jostraca.generate({
+  folder: './out',
+  existing: {
+    txt: {
+      write: true,      // overwrite existing files (default)
+      preserve: true,   // keep a .old. backup of what was overwritten
+      present: false,   // write to .new. instead of overwriting
+      diff: false,      // write an annotated 2-way diff
+      merge: false,     // 3-way merge with conflict markers
+    },
+    bin: {
+      write: true,
+      preserve: false,
+      present: false,
+    }
+  }
+}, root)
+```
+For files a user should own outright, add the line `# JOSTRACA_PROTECT`
+anywhere in the generated file — Jostraca will never overwrite it on
+subsequent runs.
+### Generate in memory (for tests or virtual FS)
+Set `mem: true` and provide any template inputs via `vol`. Nothing touches
+disk; read the result back from the returned volume:
+```typescript
+const jostraca = Jostraca({
+  mem: true,
+  vol: { '/templates/header.txt': 'HEADER\n' }
+})
+const result = await jostraca.generate({ folder: '/' }, root)
+const files = result.vol().toJSON()
+// { '/output.txt': '...' }
+```
+## Reference
+*Information-oriented. Look things up here; don't read it front to back.*
+The complete, authoritative reference for every component, prop, option,
+and utility is **[REFERENCE.md](./REFERENCE.md)**.
+### Components
+`Project`, `Folder`, `File`, `Content`, `Fragment`, `Slot`, `Inject`,
+`Copy`, `Line`, `List` — plus custom components via `cmp()`.
+### `generate()` result
+`generate()` returns a `JostracaResult`:
+```typescript
+{
+  when: number,          // timestamp of generation
+  files: {
+    written: string[],     // files written to disk
+    preserved: string[],   // backup copies created
+    presented: string[],   // .new. files created
+    diffed: string[],      // diff files created
+    merged: string[],      // merged files created
+    conflicted: string[],  // files with merge conflicts
+    unchanged: string[],   // files left unchanged
+  },
+  audit: () => Audit[],   // audit trail of operations
+  vol?: () => any,         // virtual volume (mem mode)
+  fs?: () => FST,          // file system (mem mode)
+}
+```
+### Utility exports
+```typescript
+import {
+  each,           // iterate arrays/objects with marking and sorting
+  get,            // simple dot-path property access
+  getx,           // advanced path access with operators
+  camelify,       // 'foo_bar' -> 'FooBar'
+  snakify,        // 'FooBar' -> 'foo_bar'
+  kebabify,       // 'FooBar' -> 'foo-bar'
+  names,          // generate all case variants of a name
+  template,       // process template strings with model data
+  indent,         // indent text content
+  cmp,            // create custom components
+  deep,           // deep merge objects
+  omap,           // map over object entries (sorted key order)
+} from 'jostraca'
+```
+See [REFERENCE.md](./REFERENCE.md) for signatures and edge-case behaviour.
+## Explanation
+*Understanding-oriented. Background and design — read this to build a
+mental model, not to accomplish a specific task.*
+### Two phases: define, then build
+A `generate()` call runs in two distinct phases. First, the **define
+phase** executes your callback: every component call (`Project`, `File`,
+`Content`, …) records a node in an in-memory tree — nothing is written
+yet. Then the **build phase** walks that tree and performs the real file
+operations. Separating the two means the whole intended output is known
+before a single byte is written, which is what makes existing-file
+handling, protection, and merging possible.
+### Why React-style components
+Components nest to mirror the filesystem, and they compose: a component is
+just a function that emits more components. That gives you ordinary
+language tools — loops, conditionals, parameters, reuse via `cmp()` — for
+describing structure, instead of a bespoke templating dialect. The nesting
+is kept noise-free by an `AsyncLocalStorage` context, so child components
+know their parent without you threading it through by hand.
+### The philosophy of existing files
+Generators are run repeatedly against code that humans also edit. Jostraca
+treats the already-on-disk file as a first-class input, not an obstacle:
+the `write` / `preserve` / `present` / `diff` / `merge` modes and
+`# JOSTRACA_PROTECT` exist so that regeneration is safe by policy rather
+than by luck. The three-way merge in particular keeps a baseline of what
+was last generated, so it can distinguish your edits from generator
+changes.
+---
+## Build and test (contributors)
+```bash
+cd ts
+npm install     # also pulls peer deps: memfs, shape
+npm run build   # tsc --build src test
+npm test        # node --test dist-test/**/*.test.js
+```
+From the repo root, `make all` builds and tests both the TS and Go stacks.
+See the top-level [`CLAUDE.md`](../CLAUDE.md) for the full contributor
+guide, and [`../go/README.md`](../go/README.md) for the Go port.
+## License
+MIT. Copyright (c) Richard Rodger. See [LICENSE](./LICENSE).

package/dist/build/BuildContext.d.ts CHANGED Viewed

@@ -34,6 +34,7 @@ declare class BuildContext {
         version: boolean;
     }, fs: () => FST, now: () => number);
     addmeta(file: string, meta: any): void;
+    folderPath(): string;
     duplicateFolder(): string;
 }
 export { BuildContext };

package/dist/build/BuildContext.js CHANGED Viewed

@@ -50,6 +50,16 @@ class BuildContext {
     addmeta(file, meta) {
         this.bmeta.add(file, meta);
     }
+    // Folder path segments for the current build position, as a canonical
+    // (forward-slash) prefix. When neither a Project nor a Folder has seeded
+    // the path, fall back to the base output folder — otherwise a top-level
+    // File would join onto '' and resolve to '/<name>' at the filesystem
+    // root, ignoring the configured output folder entirely. FolderOp.before
+    // applies the same fallback when seeding the path.
+    folderPath() {
+        const { path, parent } = this.current.folder;
+        return 0 < path.length ? path.join('/') : parent;
+    }
     duplicateFolder() {
         if (null == this.dfolder) {
             this.dfolder =

package/dist/build/BuildContext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BuildContext.js","sourceRoot":"","sources":["../../src/build/BuildContext.ts"],"names":[],"mappings":";;;;;;AACA,0DAA4B;AAS5B,+CAEsB;AAEtB,2CAEoB;AAapB,MAAM,EAAE,GAAG,eAAe,CAAA;AAG1B,4DAA4D;AAC5D,MAAM,YAAY;IAEhB,EAAE,CAAW;IACb,GAAG,CAAc;IAEjB,KAAK,CAAW;IAChB,EAAE,CAAa;IACf,KAAK,CAAO;IACZ,IAAI,CAAQ;IACZ,GAAG,CAAK;IACR,MAAM,CAAQ;IACd,OAAO,CASN;IACD,GAAG,CAGF;IAED,OAAO,CAAS;IAGhB,YACE,MAAc,EACd,QAAkB,EAClB,OAIC,EACD,EAAa,EACb,GAAiB;QAEjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAEd,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,EAAE,GAAG,iCAAiC,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;QACrE,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAA;QAEjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,SAAS,EAAE;aAClB;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,SAAS,EAAE;gBACjB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,EAAE;aACT;YACD,4BAA4B;YAC5B,IAAI,EAAE,SAAS,EAAE;YACjB,OAAO,EAAE,SAAS;SACnB,CAAA;QACD,IAAI,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAA;QAEpC,IAAI,CAAC,EAAE,GAAG,IAAI,yBAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAClD,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACrC,CAAC;IAGD,OAAO,CAAC,IAAY,EAAE,IAAS;QAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC5B,CAAC;IAGD,eAAe;QACb,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO;gBACV,mBAAI,CAAC,SAAS,CACZ,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAA;QACtE,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;CACF;~~AAUC~~,~~oCAAY~~;AAPd,SAAS,SAAS;IAChB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAA;AAC1D,CAAC"}
1	+ {"version":3,"file":"BuildContext.js","sourceRoot":"","sources":["../../src/build/BuildContext.ts"],"names":[],"mappings":";;;;;;AACA,0DAA4B;AAS5B,+CAEsB;AAEtB,2CAEoB;AAapB,MAAM,EAAE,GAAG,eAAe,CAAA;AAG1B,4DAA4D;AAC5D,MAAM,YAAY;IAEhB,EAAE,CAAW;IACb,GAAG,CAAc;IAEjB,KAAK,CAAW;IAChB,EAAE,CAAa;IACf,KAAK,CAAO;IACZ,IAAI,CAAQ;IACZ,GAAG,CAAK;IACR,MAAM,CAAQ;IACd,OAAO,CASN;IACD,GAAG,CAGF;IAED,OAAO,CAAS;IAGhB,YACE,MAAc,EACd,QAAkB,EAClB,OAIC,EACD,EAAa,EACb,GAAiB;QAEjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QAEd,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,EAAE,GAAG,iCAAiC,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;QACrE,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;QACf,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAA;QAEjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,SAAS,EAAE;aAClB;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,SAAS,EAAE;gBACjB,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,EAAE;aACT;YACD,4BAA4B;YAC5B,IAAI,EAAE,SAAS,EAAE;YACjB,OAAO,EAAE,SAAS;SACnB,CAAA;QACD,IAAI,CAAC,GAAG,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAA;QAEpC,IAAI,CAAC,EAAE,GAAG,IAAI,yBAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;QAClD,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACrC,CAAC;IAGD,OAAO,CAAC,IAAY,EAAE,IAAS;QAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC5B,CAAC;IAGD,sEAAsE;IACtE,yEAAyE;IACzE,wEAAwE;IACxE,qEAAqE;IACrE,wEAAwE;IACxE,mDAAmD;IACnD,UAAU;QACR,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAA;QAC5C,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IAClD,CAAC;IAGD,eAAe;QACb,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO;gBACV,mBAAI,CAAC,SAAS,CACZ,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAA;QACtE,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;CACF;QAUC,YAAY;AAPd,SAAS,SAAS;IAChB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAA;AAC1D,CAAC"}

package/dist/build/BuildMeta.js CHANGED Viewed

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildMeta = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const basic_1 = require("../util/basic");
+// Log non-fatal weirdness.
+const dlog = (0, basic_1.getdlog)('jostraca', __filename);
 // Handle loading, recording,and saving of build meta data
 class BuildMeta {
     fh;
@@ -58,10 +60,25 @@ function loadMetaData(fh, bmeta) {
     // directly and no longer re-join `this.folder`.
     const metapath = node_path_1.default.join(fh.folder, bmeta.foldername, bmeta.filename);
     if (fh.existsFile(metapath)) {
-        const json = fh.loadJSON(metapath);
-        bmeta.last = json.last;
-        bmeta.hlast = json.hlast;
-        bmeta.files = json.files;
+        try {
+            const json = fh.loadJSON(metapath);
+            bmeta.last = null == json?.last ? -1 : json.last;
+            bmeta.hlast = null == json?.hlast ? -1 : json.hlast;
+            bmeta.files = json?.files || {};
+        }
+        catch (err) {
+            // A truncated or hand-edited meta log used to throw straight out of
+            // the BuildMeta constructor, so a corrupt bookkeeping file blocked
+            // generation entirely — with a JSON parse error that says nothing
+            // about how to recover. The log is regenerated on every run, so
+            // starting from empty state is safe: the only cost is that merge
+            // baselines look absent for one run.
+            dlog('meta', 'unreadable meta log, continuing with empty state: ' +
+                metapath + ' err=' + err.message);
+            bmeta.last = -1;
+            bmeta.hlast = -1;
+            bmeta.files = {};
+        }
     }
     return bmeta;
 }

package/dist/build/BuildMeta.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BuildMeta.js","sourceRoot":"","sources":["../../src/build/BuildMeta.ts"],"names":[],"mappings":";;;;;;AACA,0DAA4B;AAI5B,~~yCAAwC~~;~~AAmBxC~~,0DAA0D;AAC1D,MAAM,SAAS;IAEb,EAAE,CAAa;IAEf,IAAI,CAAe;IACnB,IAAI,CAAe;IAEnB,YACE,EAAe;QAEf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QAEZ,+DAA+D;QAC/D,IAAI,CAAC,IAAI,GAAG;YACV,UAAU,EAAE,WAAW;YACvB,QAAQ,EAAE,mBAAmB;YAC7B,IAAI,EAAE,CAAC,CAAC;YACR,KAAK,EAAE,CAAC,CAAC;YACT,KAAK,EAAE,EAAE;SACV,CAAA;QAED,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAE5C,4BAA4B;QAE5B,IAAI,CAAC,IAAI,GAAG;YACV,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,IAAI,EAAE,CAAC,CAAC;YACR,KAAK,EAAE,CAAC,CAAC;YACT,KAAK,EAAE,EAAE;SACV,CAAA;IAEH,CAAC;IAGD,IAAI;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;IACvB,CAAC;IAGD,GAAG,CAAC,IAAY,EAAE,IAAS;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;QACrD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAA;IAC/B,CAAC;IAGD,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAA,gBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAE1C,qBAAqB;QACrB,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAEhC,IAAI,KAAK,KAAK,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACtC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,mBAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE;EACpF,IAAI,CAAC,IAAI,CAAC,QAAQ;;CAEnB,CAAC,CAAA;QACE,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;CACF;~~AA0BC~~,~~8BAAS~~;~~AAvBX~~,SAAS,YAAY,CAAC,EAAe,EAAE,KAAoB;IACzD,oEAAoE;IACpE,gDAAgD;IAChD,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IACvE,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;~~QAClC~~,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;~~QACtB~~,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;~~QACxB~~,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;~~IAC1B~~,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAGD,SAAS,YAAY,CAAC,EAAe,EAAE,KAAoB;IACzD,oEAAoE;IACpE,gDAAgD;IAChD,MAAM,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IACvE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;AAC9B,CAAC"}
1	+ {"version":3,"file":"BuildMeta.js","sourceRoot":"","sources":["../../src/build/BuildMeta.ts"],"names":[],"mappings":"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"}

package/dist/build/FileHandler.d.ts CHANGED Viewed

@@ -30,6 +30,7 @@ declare class FileHandler {
         unchanged: string[];
     };
     createdDirs: Set<string>;
+    savedPaths: Set<string>;
     constructor(bctx: BuildContext, existing: {
         txt: any;
         bin: any;
@@ -39,13 +40,15 @@ declare class FileHandler {
         version: boolean;
     });
     relative(path: string, whence?: string): string;
-    save(path: string, newContentSource: string | Buffer, write?: boolean | string, whence?: string): void;
+    withinFolder(path: string): boolean;
+    saveBinary(path: string, newContentSource: string | Buffer, whence?: string): void;
+    save(path: string, newContentSource: string | Buffer, write?: boolean | string, whence?: string, mode?: number, isText?: boolean): void;
     copy(frompath: string, topath: string, write?: boolean | string, whence?: string): void;
-    merge(editA: string, orig: string, editB: string, why: string[]): {
+    merge(generated: string, baseline: string, existing: string, why: string[]): {
         content: string;
         conflict: boolean;
     };
-    diff(oldcontent: string, newcontent: string): string;
+    diff(generated: string, existing: string): string;
     existsFile(path: string, whence?: string): boolean;
     copyFile(frompath: string, topath: string, whence?: string): void;
     loadJSON(path: string, opts?: any | string, whence?: string): any;
@@ -53,8 +56,12 @@ declare class FileHandler {
     loadFile(path: string, opts?: any | string, whence?: string): string | Buffer;
     ensureFolder(path: string): void;
     private ensureDir;
+    private chmodUnchanged;
+    private writeFileAtomic;
     saveFile(path: string, content: string | Buffer, opts?: any | string, whence?: string): void;
     filelog(kind: string, path: string): void;
 }
+declare function annotatedPath(target: string, kind: string): string;
+declare function validName(name: any, kind: string, errmark: string): void;
 declare function validPath(path: string, maxdepth: number, errmark: string): void;
-export { validPath, FileHandler };
+export { annotatedPath, validName, validPath, FileHandler };