@wavehouse/chtypes 1.0.2 → 1.0.4

package/dist/setup.js

@@ -11,12 +11,16 @@
  *      the first open records the empty setup: the empty zone, which the
  *      library reads as UTC, and no defaults. Once an image completes loader
  *      step 7 (`chs_initialize`, then `chs_set_defaults` when there are
- *      defaults), `setup` succeeds only with exactly the setup in effect. If
- *      step 7 fails before any image has completed it, the record is cleared,
- *      so a corrected `setup` is accepted and the next open runs step 7 with it.
+ *      defaults), `setup` succeeds only with exactly the setup in effect
+ *      (`latchSetup`). Until then, an open that attempted a load and failed,
+ *      whatever failed (the fetch, the signature, an incompatible artifact, a
+ *      missing symbol or step 7), keeps the record but makes it replaceable
+ *      (`settleFailedOpen`): a retry with no new `setup` runs under the
+ *      recorded setup, and a different `setup` replaces it. A refused version
+ *      spelling or an unverified open without the caller's opt-in fails before
+ *      any load is attempted, and unlocks nothing.
  *   3. Every image is set up at loader step 7, once, from this record
- *      (`./abi1/loader.ts`), which reports how step 7 ended to `settleSetup`;
- *      nothing sets either again for that image.
+ *      (`./abi1/loader.ts`); nothing sets either again for that image.
  *
  * This is state of the isolate: every worker thread calls it identically, and
  * a worker whose zone differs is refused by the library at its first open.
@@ -26,6 +30,10 @@ import { validateDefaults } from './settings.js';
 let recorded;
 /** Whether any image has completed loader step 7 under the record. */
 let latched = false;
+/** Whether an open that attempted a load failed since the record was last set or committed, with nothing latched: a different `setup` then replaces the record instead of being refused. */
+let replaceable = false;
+/** Counts the records `setup` made or replaced. An open reads it when its attempt begins, and unlocks the record on failure only if it is unchanged: a failed open never unlocks a setup recorded after it began. */
+let generation = 0;
 function describe(s) {
     const keys = Object.keys(s.defaults).sort();
     const defaults = keys.length === 0 ? 'no defaults' : `defaults ${JSON.stringify(Object.fromEntries(keys.map((k) => [k, s.defaults[k]])))}`;
@@ -46,34 +54,43 @@ export function setup(options = {}) {
     const defaults = options.defaults ?? {};
     validateDefaults(defaults);
     const next = { timezone, defaults: { ...defaults } };
-    if (recorded === undefined) {
-        recorded = next;
+    if (recorded !== undefined && same(recorded, next))
         return;
-    }
-    if (!same(recorded, next)) {
+    if (recorded !== undefined && (latched || !replaceable)) {
         throw usageError(`setup was already fixed at ${describe(recorded)}; it was asked for ${describe(next)}. The first setup stands: call setup before the first open, once.`);
     }
+    // A first record, or a replacement after a failed open: either way the new record is locked until the next failed open.
+    recorded = next;
+    replaceable = false;
+    generation += 1;
 }
-/** The setup in effect, recording the empty setup if none was recorded: what an open does before step 7. */
+/** The setup in effect, recording the empty setup if none was recorded: what an open does before step 7. The load that follows claims the record, so it is locked again. */
 export function commitSetup() {
     recorded ??= { timezone: '', defaults: {} };
+    replaceable = false;
     return recorded;
 }
+/** Read when an open's attempt begins, for `settleFailedOpen`. */
+export function setupGeneration() {
+    return generation;
+}
+/** An image completed loader step 7: from then on the setup in effect stands. An open calls it synchronously after the load that committed the record, so it latches the record that load ran under. */
+export function latchSetup() {
+    latched = true;
+    replaceable = false;
+}
 /**
- * How loader step 7 ended, reported by the loader. A success latches the setup in effect. A failure before any image has completed step 7 clears the record, so `setup` accepts a corrected setup; once the setup has latched, a failure changes nothing (the library's own process-once rule answers a different zone on an image that already has one).
- * An isolate runs this synchronously with the commit and the load that preceded it, so the record it settles is the one that load ran under.
+ * Settle an open that attempted a load and failed, whatever failed. While no image has completed step 7 it unlocks the record: the record stays, so a retry runs under it, and a different `setup` may replace it. It leaves alone a setup recorded or replaced after the open began (`began` is `setupGeneration()` then), and once the setup has latched it changes nothing: the library's own process-once rule answers a different zone on an image that already has one.
  */
-export function settleSetup(completed) {
-    if (completed) {
-        latched = true;
+export function settleFailedOpen(began) {
+    if (latched || recorded === undefined || generation !== began)
         return;
-    }
-    if (!latched)
-        recorded = undefined;
+    replaceable = true;
 }
-/** Test only: forget the recorded setup and the latch. Not part of the public API. */
+/** Test only: forget the recorded setup, the latch and the unlock. Not part of the public API. */
 export function resetSetupForTests() {
     recorded = undefined;
     latched = false;
+    replaceable = false;
 }
 //# sourceMappingURL=setup.js.map

package/dist/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wavehouse/chtypes",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "ClickHouse's own type system, per version, over the frozen chs_* C ABI",
   "license": "Apache-2.0",
   "type": "module",