sh3-core 0.21.0 → 0.21.2

package/dist/app/store/StoreView.svelte

@@ -111,6 +111,8 @@
     for (const p of installed) {
       if (p.type === 'shard' || p.type === 'combo') known.add(p.id);
     }
+    // A combo package provides its own shard — don't block it on its own id.
+    if (pkg.entry.type === 'combo') known.add(pkg.entry.id);
     return required.filter((id: string) => !known.has(id));
   }
 

package/dist/build.d.ts

@@ -82,4 +82,9 @@ export declare function composeArtifactVersion(pkgVersion: string, suffix: strin
  * Exported for testing; used internally by sh3Artifact.
  */
 export declare function extractRequiredShardsFromBundle(bundleSource: string): string[];
+/**
+ * Collect all shard ids present in a bundle by scanning every `views: [` block.
+ * Exported for testing.
+ */
+export declare function extractBundledShardIds(bundleSource: string): Set<string>;
 export declare function sh3Artifact(options?: Sh3ArtifactOptions): Plugin;

package/dist/build.js

@@ -159,6 +159,50 @@ export function extractRequiredShardsFromBundle(bundleSource) {
         ids.push(m[1]);
     return ids;
 }
+/**
+ * Collect all shard ids present in a bundle by scanning every `views: [` block.
+ * Exported for testing.
+ */
+export function extractBundledShardIds(bundleSource) {
+    const ids = new Set();
+    const viewsRe = /\bviews\s*:\s*\[/g;
+    let m;
+    while ((m = viewsRe.exec(bundleSource)) !== null) {
+        // Walk back to the enclosing `{`.
+        let depth = 0;
+        let blockStart = m.index;
+        for (let i = m.index - 1; i >= 0; i--) {
+            if (bundleSource[i] === '}')
+                depth++;
+            if (bundleSource[i] === '{') {
+                if (depth === 0) {
+                    blockStart = i;
+                    break;
+                }
+                depth--;
+            }
+        }
+        // Walk forward to the matching `}`.
+        depth = 0;
+        let blockEnd = bundleSource.length;
+        for (let i = blockStart; i < bundleSource.length; i++) {
+            if (bundleSource[i] === '{')
+                depth++;
+            if (bundleSource[i] === '}') {
+                depth--;
+                if (depth === 0) {
+                    blockEnd = i + 1;
+                    break;
+                }
+            }
+        }
+        const block = bundleSource.slice(blockStart, blockEnd);
+        const idMatch = block.match(/\bid\s*:\s*["']([^"']+)["']/);
+        if (idMatch)
+            ids.add(idMatch[1]);
+    }
+    return ids;
+}
 export function sh3Artifact(options = {}) {
     let outDir = '';
     let entryFileName = '';
@@ -265,7 +309,13 @@ export function sh3Artifact(options = {}) {
             }
             // App first, then Shard.
             const extracted = (_a = extractFromBlock(/\brequiredShards\s*:\s*\[/)) !== null && _a !== void 0 ? _a : extractFromBlock(/\bviews\s*:\s*\[/);
-            const { id, label, requiredShards } = extracted;
+            const { id, label } = extracted;
+            let { requiredShards } = extracted;
+            // Strip any shard ids that are bundled in this artifact from requiredShards.
+            const bundledShardIds = extractBundledShardIds(source);
+            if (bundledShardIds.size > 0) {
+                requiredShards = requiredShards.filter(s => !bundledShardIds.has(s));
+            }
             // --- Optional server bundle ---
             let hasServer = false;
             if (options.serverEntry && existsSync(options.serverEntry)) {

package/dist/build.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { composeArtifactVersion, extractRequiredShardsFromBundle } from './build';
+import { composeArtifactVersion, extractRequiredShardsFromBundle, extractBundledShardIds } from './build';
 describe('composeArtifactVersion', () => {
     it('returns pkgVersion unchanged when suffix is undefined', () => {
         expect(composeArtifactVersion('1.2.3', undefined)).toBe('1.2.3');
@@ -55,3 +55,32 @@ describe('extractRequiredShardsFromBundle', () => {
         expect(extractRequiredShardsFromBundle(src)).toEqual(['guml.core', 'other-shard']);
     });
 });
+describe('extractBundledShardIds', () => {
+    it('returns empty set when no shard blocks are present', () => {
+        const src = `const App = { id: "my-app", requiredShards: ["sh3-file-explorer"] };`;
+        expect(extractBundledShardIds(src)).toEqual(new Set());
+    });
+    it('extracts a single bundled shard id', () => {
+        const src = `const Shard = { id: "sh3-file-explorer", views: [] };`;
+        expect(extractBundledShardIds(src)).toEqual(new Set(['sh3-file-explorer']));
+    });
+    it('extracts multiple bundled shard ids', () => {
+        const src = `
+      const A = { id: "shard-a", views: [] };
+      const B = { id: "shard-b", views: [] };
+    `;
+        expect(extractBundledShardIds(src)).toEqual(new Set(['shard-a', 'shard-b']));
+    });
+    it('bundled shard ids are filtered from requiredShards', () => {
+        // Simulate a combo bundle: app requires shard-a and external-dep,
+        // but shard-a is present in the same bundle.
+        const src = `
+      const App = { id: "my-app", requiredShards: ["shard-a", "external-dep"] };
+      const Shard = { id: "shard-a", views: [] };
+    `;
+        const bundled = extractBundledShardIds(src);
+        const required = extractRequiredShardsFromBundle(src);
+        const filtered = required.filter(s => !bundled.has(s));
+        expect(filtered).toEqual(['external-dep']);
+    });
+});

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 /** Auto-generated from package.json — do not edit manually. */
-export declare const VERSION = "0.21.0";
+export declare const VERSION = "0.21.2";

package/dist/version.js

@@ -1,2 +1,2 @@
 /** Auto-generated from package.json — do not edit manually. */
-export const VERSION = '0.21.0';
+export const VERSION = '0.21.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh3-core",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "type": "module",
   "files": [
     "dist"