@sparkelf/dsh-plus 0.1.0-rc.26 → 0.1.0-rc.28

package/lib/bin.js

@@ -2,7 +2,7 @@
 import { r as runApply } from "./apply-e0aMC4B4.js";
 import { createRequire } from "node:module";
 import { execFileSync, spawn, spawnSync } from "node:child_process";
-import { createWriteStream, existsSync, mkdirSync, readFileSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
+import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { homedir } from "node:os";
 import semver from "semver";
@@ -282,6 +282,11 @@ function readDistributionProfile(distributionDirectory) {
 * `node_modules` cannot see packages the consumer installed beside it. One link to
 * the consumer's directory keeps a single installed copy as the only authority.
 *
+* npm hoists what it can and nests the rest, so a bundle can sit at the consumer's
+* top level or inside the package that depends on it. The profile reaches the first
+* through one link and the second through the distribution's own `node_modules`, and
+* a bundle found in neither is one the installation does not carry at all.
+*
 * @param paths - resolved standalone paths.
 * @param consumerDirectory - directory whose `node_modules` holds the packages.
 */
@@ -290,8 +295,37 @@ function linkConsumerPackages(paths, consumerDirectory) {
 	if (!existsSync(target)) throw new Error("no node_modules in " + consumerDirectory + "; run npm install there first");
 	mkdirSync(paths.profileDirectory, { recursive: true });
 	const link = join(paths.profileDirectory, "node_modules");
-	if (existsSync(link)) return;
-	symlinkSync(target, link, "junction");
+	if (!existsSync(link)) symlinkSync(target, link, "junction");
+	linkNestedBundles(paths, target);
+}
+/**
+* Expose the distribution's nested packages at the top level the profile searches.
+*
+* The profile resolves a bundle from one directory, so a package npm nested under the
+* distribution is invisible there even though the installation carries it. Linking each
+* one beside the hoisted packages keeps a single installed copy and needs no reinstall.
+*
+* @param paths - resolved standalone paths.
+* @param consumerModules - the consumer's `node_modules` directory.
+*/
+function linkNestedBundles(paths, consumerModules) {
+	const nested = join(paths.distributionDirectory, "node_modules");
+	if (!existsSync(nested)) return;
+	for (const entry of readdirSync(nested)) {
+		if (entry.startsWith("@")) {
+			for (const scoped of readdirSync(join(nested, entry))) linkBundle(consumerModules, join(entry, scoped), join(nested, entry, scoped));
+			continue;
+		}
+		linkBundle(consumerModules, entry, join(nested, entry));
+	}
+}
+/** Link one nested bundle into the consumer's top level when it is not already there. */
+function linkBundle(consumerModules, name, source) {
+	const destination = join(consumerModules, name);
+	if (existsSync(destination)) return;
+	try {
+		symlinkSync(source, destination, "junction");
+	} catch {}
 }
 /** Resolve every path a command needs, without creating anything. */
 function resolvePaths(anchor, env = process.env) {
@@ -636,7 +670,7 @@ async function runStandaloneCli(argv) {
 async function main() {
 	const argv = process.argv.slice(2);
 	if (argv[0] === "apply") {
-		runApply(argv.slice(1));
+		runApply(argv);
 		return 0;
 	}
 	return await runStandaloneCli(argv);

package/lib/types/apply.js

@@ -400,6 +400,10 @@ function writeProfileRequirements(profileDirectory, dependencySpecs, allowBuilds
     const managedFileAsset = (value) => value.startsWith('file:')
         && (/[\\/]\.dsh[\\/]releases[\\/]plus[\\/].*[\\/]packages[\\/]/u.test(value)
             || /[\\/]\.dsh-plus[\\/]packages[\\/]/u.test(value));
+    // Override names a previously accepted profile may carry and this one must drop.
+    // The office preview moved from the upstream Huanlin package to SparkElf's own
+    // redistribution of it, so an older profile's override for the upstream name has to
+    // go; the replacement is an ordinary profile dependency, not an override.
     const retiredOverrides = new Set([
         '@huanlin/dsh-plugin-better-sidebar-plugin-office',
         '@sparkelf/dsh-office-viewer-fonts',

package/lib/types/bin.js

@@ -15,7 +15,9 @@ async function main() {
     const argv = process.argv.slice(2);
     const first = argv[0];
     if (first === 'apply') {
-        runApply(argv.slice(1));
+        // `runApply` parses the command word itself, so it receives the arguments this
+        // dispatcher already inspected rather than a slice that dropped it.
+        runApply(argv);
         return 0;
     }
     return await runStandaloneCli(argv);

package/lib/types/standalone-profile.d.ts

@@ -47,6 +47,11 @@ export declare function readDistributionProfile(distributionDirectory: string):
  * `node_modules` cannot see packages the consumer installed beside it. One link to
  * the consumer's directory keeps a single installed copy as the only authority.
  *
+ * npm hoists what it can and nests the rest, so a bundle can sit at the consumer's
+ * top level or inside the package that depends on it. The profile reaches the first
+ * through one link and the second through the distribution's own `node_modules`, and
+ * a bundle found in neither is one the installation does not carry at all.
+ *
  * @param paths - resolved standalone paths.
  * @param consumerDirectory - directory whose `node_modules` holds the packages.
  */

package/lib/types/standalone-profile.js

@@ -8,7 +8,7 @@
  * the launcher mounts exactly the bundles the profile names and nothing expands a
  * bundle's own list.
  */
-import { existsSync, mkdirSync, readFileSync, symlinkSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, readdirSync, readFileSync, symlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
@@ -89,6 +89,11 @@ export function readDistributionProfile(distributionDirectory) {
  * `node_modules` cannot see packages the consumer installed beside it. One link to
  * the consumer's directory keeps a single installed copy as the only authority.
  *
+ * npm hoists what it can and nests the rest, so a bundle can sit at the consumer's
+ * top level or inside the package that depends on it. The profile reaches the first
+ * through one link and the second through the distribution's own `node_modules`, and
+ * a bundle found in neither is one the installation does not carry at all.
+ *
  * @param paths - resolved standalone paths.
  * @param consumerDirectory - directory whose `node_modules` holds the packages.
  */
@@ -99,9 +104,47 @@ export function linkConsumerPackages(paths, consumerDirectory) {
     }
     mkdirSync(paths.profileDirectory, { recursive: true });
     const link = join(paths.profileDirectory, 'node_modules');
-    if (existsSync(link))
+    if (!existsSync(link))
+        symlinkSync(target, link, 'junction');
+    // A profile created before the installation changed must still reach what npm nested
+    // afterwards, so this runs on every start rather than only when the profile is new.
+    linkNestedBundles(paths, target);
+}
+/**
+ * Expose the distribution's nested packages at the top level the profile searches.
+ *
+ * The profile resolves a bundle from one directory, so a package npm nested under the
+ * distribution is invisible there even though the installation carries it. Linking each
+ * one beside the hoisted packages keeps a single installed copy and needs no reinstall.
+ *
+ * @param paths - resolved standalone paths.
+ * @param consumerModules - the consumer's `node_modules` directory.
+ */
+function linkNestedBundles(paths, consumerModules) {
+    const nested = join(paths.distributionDirectory, 'node_modules');
+    if (!existsSync(nested))
         return;
-    symlinkSync(target, link, 'junction');
+    for (const entry of readdirSync(nested)) {
+        if (entry.startsWith('@')) {
+            for (const scoped of readdirSync(join(nested, entry))) {
+                linkBundle(consumerModules, join(entry, scoped), join(nested, entry, scoped));
+            }
+            continue;
+        }
+        linkBundle(consumerModules, entry, join(nested, entry));
+    }
+}
+/** Link one nested bundle into the consumer's top level when it is not already there. */
+function linkBundle(consumerModules, name, source) {
+    const destination = join(consumerModules, name);
+    if (existsSync(destination))
+        return;
+    try {
+        symlinkSync(source, destination, 'junction');
+    }
+    catch {
+        // A concurrent start may have created the same link; the existing one is equivalent.
+    }
 }
 /** Resolve every path a command needs, without creating anything. */
 export function resolvePaths(anchor, env = process.env) {

package/package.json

@@ -72,7 +72,8 @@
         "dshmarket",
         "@huanlin/dsh-plugin-better-locale",
         "dsh-better-sidebar",
-        "@huanlin/dsh-plugin-better-sidebar-plugin-office",
+        "@sparkelf/dsh-plugin-better-sidebar-office",
+        "@sparkelf/dsh-office-viewer-fonts",
         "dsh-video-preview",
         "@changfenhuang/dsh-genui",
         "@sparkelf/dsh-plugin-supervisor",
@@ -84,10 +85,11 @@
       "dependencies": {
         "@changfenhuang/dsh-genui": "0.9.9",
         "@huanlin/dsh-plugin-better-locale": "0.4.1",
-        "@huanlin/dsh-plugin-better-sidebar-plugin-office": "0.2.0",
         "@sparkelf/dsh-api-client": "0.5.1",
         "@sparkelf/dsh-mineru": "0.1.2",
+        "@sparkelf/dsh-office-viewer-fonts": "0.1.2",
         "@sparkelf/dsh-officecli": "0.1.2",
+        "@sparkelf/dsh-plugin-better-sidebar-office": "0.2.1",
         "@sparkelf/dsh-plugin-supervisor": "0.1.5",
         "@sparkelf/dsh-ssh-manager": "0.7.2",
         "@sparkelf/dsh-workbench-vault": "0.1.2",
@@ -136,5 +138,5 @@
   },
   "type": "module",
   "types": "lib/types/index.d.ts",
-  "version": "0.1.0-rc.26"
+  "version": "0.1.0-rc.28"
 }