@voxgig/sdkgen 4.11.0 → 4.12.0

package/bin/voxgig-sdkgen

@@ -8,7 +8,7 @@ const { Shape, One, Skip } = require('shape')
 
 const { SdkGen } = require('../dist/sdkgen.js')
 
-const VERSION = '4.11.0'
+const VERSION = '4.12.0'
 const KONSOLE = console
 
 

package/dist/action/resolve.js

@@ -269,7 +269,81 @@ function nameConflict(kind, source, ctx$) {
     const samePackage = null != source.package && '' !== source.package &&
         declared.package === source.package;
     const sameBase = normaliseBase(declared.base) === normaliseBase(source.base);
-    return (samePackage || sameBase) ? undefined : declared;
+    if (samePackage || sameBase) {
+        return undefined;
+    }
+    // The record names a DIFFERENT source. That is a collision only if that
+    // source still provides this name — otherwise the record is STALE and
+    // adopting the new one is a migration, not a silent clobber.
+    //
+    // A package can stop providing something it used to: `seneca-provider` left
+    // @voxgig/sdkgen for @voxgig/sdkgen-infrapack, `dart`/`haskell`/`lean` left
+    // for @voxgig/sdkgen-langpack. Every project carrying the pre-split copy
+    // still records the old package, so a check that reads only the record
+    // refuses the very add that repairs it, and names as the incumbent a
+    // package that no longer ships the thing at all. The only way through was
+    // `<kind> add <package>/<name>`, which nobody guesses from the message.
+    return providesStill(kind, declared, source, ctx$) ? declared : undefined;
+}
+// Does the RECORDED source still provide this name?
+//
+// Answered from what is on disk now, not from the record. Conservative in
+// both directions: an unreadable or absent source cannot be shown to provide
+// it, so the add proceeds; anything still providing it is a real collision
+// and still refuses.
+function providesStill(kind, declared, source, ctx$) {
+    let fs;
+    try {
+        fs = ctx$.fs();
+    }
+    catch (err) {
+        // No filesystem to check with — keep the pre-existing behaviour.
+        return true;
+    }
+    const base = String(declared.base);
+    const folder = node_path_1.default.isAbsolute(base) ?
+        node_path_1.default.normalize(base) :
+        node_path_1.default.normalize(node_path_1.default.join(ctx$.folder, base));
+    if (!fs.existsSync(folder)) {
+        // Uninstalled, moved, or never fetched. Nothing there to collide with.
+        return false;
+    }
+    // The name to look for is the one the SOURCE knows it by, which differs
+    // from the installed name only for an alias.
+    //
+    // `||`, NOT `??`. `origname` is `*'' | string` in the schema, and the model
+    // records the empty string for every unaliased item -- the convention is a
+    // falsy default, not an absent key. Nullish coalescing does not fall back
+    // for '', so a reloaded project would have every ordinary item looked up as
+    // '', found in no manifest, and declared stale: the guard would then wave
+    // through exactly the silent overwrite it exists to stop. The in-process
+    // tests could not see it, because `registerInstalled` leaves `origname`
+    // non-empty in the same context that wrote it.
+    const seek = declared.origname || source.name;
+    // A WELL-FORMED manifest is authoritative about what its package provides:
+    // a definition file can linger in a stale node_modules tree after the
+    // package dropped it, and `provides` is the claim `package add` is itself
+    // checked against.
+    //
+    // A manifest that would fail validation is not authoritative about
+    // anything. `resolveSource` deliberately tolerates a malformed manifest on
+    // the direct-add path -- the definition, components and templates are all
+    // present, so it installs them and records `base` -- which is precisely how
+    // an installed item comes to have one. Reading `provides` out of it anyway
+    // would let a shape error (`provides: { target: 'iotgo' }`, a string where
+    // a list belongs) read as "provides nothing" and clear the way to overwrite
+    // a live target. Fall through to the definition file instead, which is what
+    // a source with no manifest at all is judged on.
+    const read = (0, manifest_1.readManifest)(fs, folder);
+    const manifest = read.manifest;
+    if (null != manifest && 0 === (0, manifest_1.checkShape)(manifest, read.file).length) {
+        const names = manifest.provides?.[kind];
+        return Array.isArray(names) && names.includes(seek);
+    }
+    // No manifest, or one too malformed to be believed: a bare `.sdk`-shaped
+    // folder is a legal source, and its definition file is the only claim it
+    // makes.
+    return fs.existsSync((0, definition_1.definitionPath)(folder, kind, seek));
 }
 function normaliseBase(base) {
     return node_path_1.default.normalize(String(base ?? '')).split(node_path_1.default.sep).join('/');

package/dist/action/resolve.js.map

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