@mearl/preset 3.0.0-beta.5 → 3.0.0-beta.7

package/dist/preset.js

@@ -1,5 +1,5 @@
 import { browserPresetSnapshot } from './browserPreset.js';
-import { preparePresetPackages, presetSnapshotRevision, verifyPresetGraph } from './prepare.js';
+import { preparePresetPackages, presetSnapshotRevision, verifyPresetGraph, verifyPackageTargets } from './prepare.js';
 import { satisfies } from 'semver';
 import { BundleError, MAX_BROWSER_STORAGE_BYTES, verifyBundle } from './bundle.js';
 export async function preparePreset(source, options) {
@@ -9,6 +9,7 @@ export async function preparePreset(source, options) {
         source: prepared.source,
         manifests: prepared.manifests,
         bundleRevisions: Object.fromEntries(prepared.bundles.map(bundle => [bundle.manifest.id, bundle.revision])),
+        packageTargets: prepared.packageTargets,
     };
     const snapshot = { ...data, revision: await presetSnapshotRevision(data) };
     const browser = await browserPresetSnapshot(prepared.source, prepared.manifests, prepared.preset, prepared.bundles);
@@ -44,6 +45,7 @@ export async function verifyPreparedPreset(value, mearlApiVersion) {
         Promise.all(value.bundles.map(bundle => verifyBundle(bundle, mearlApiVersion))),
     ]);
     const { snapshot, preset } = graph;
+    verifyPackageTargets(preset, bundles);
     if (bundles.length !== Object.keys(snapshot.bundleRevisions).length || new Set(bundles.map(bundle => bundle.manifest.id)).size !== bundles.length || bundles.some(bundle => {
         const entry = preset.packages[bundle.manifest.id];
         return snapshot.bundleRevisions[bundle.manifest.id] !== bundle.revision || entry?.source !== bundle.source || (entry.version && !satisfies(bundle.manifest.version, entry.version));

package/dist/requestUi.d.ts

@@ -49,7 +49,9 @@ export interface SelectedBrowserRequestUi {
     definition: BrowserRequestUi;
 }
 export declare function validateBrowserUiText(value: unknown): void;
-export declare function browserUiHttpUrl(value: unknown): string;
+export declare function browserUiHttpUrl(value: unknown, options?: {
+    allowFragment?: boolean;
+}): string;
 export declare function validateBrowserRequestUi(input: unknown): BrowserRequestUi;
 /** Contribution validation is pure; factories and UI side effects belong to the host. */
 export declare function selectBrowserRequestUi(bundles: PreparedBundle[], apiVersion: string): SelectedBrowserRequestUi | undefined;

package/dist/requestUi.js

@@ -10,7 +10,7 @@ export function validateBrowserUiText(value) {
     if (typeof value.en !== 'string' || !value.en.trim() || Object.values(value).some(entry => typeof entry !== 'string' || entry.length > 1024 || !entry.trim()))
         invalid('Request UI text requires bounded translations');
 }
-export function browserUiHttpUrl(value) {
+export function browserUiHttpUrl(value, options = {}) {
     if (typeof value !== 'string' || value.length > 4096)
         invalid('Invalid request UI URL');
     let url;
@@ -20,7 +20,7 @@ export function browserUiHttpUrl(value) {
     catch {
         invalid('Invalid request UI URL');
     }
-    if (url.username || url.password || url.hash || url.protocol !== 'https:' && !(url.protocol === 'http:' && ['127.0.0.1', 'localhost', '[::1]'].includes(url.hostname)))
+    if (url.username || url.password || !options.allowFragment && url.hash || url.protocol !== 'https:' && !(url.protocol === 'http:' && ['127.0.0.1', 'localhost', '[::1]'].includes(url.hostname)))
         invalid('Request UI requires credential-free HTTPS or loopback URLs');
     return url.href;
 }

package/dist/resolve.js

@@ -1,3 +1,4 @@
+import { parseToolboxCatalogs } from './toolboxCatalogs.js';
 import { satisfies, valid } from 'semver';
 import { clonePresetDefaults, isJsonObject, PresetError, validatePreset } from './manifest.js';
 const kinds = ['packages', 'skills', 'providers'];
@@ -127,6 +128,9 @@ export async function resolvePreset(source, options) {
         return result;
     };
     const result = await load(sourceUrl(source));
+    const extension = result.defaults.extension;
+    if (isJsonObject(extension))
+        parseToolboxCatalogs(extension.toolCatalogs);
     // Dependency validity is checked on the final graph, so children may complete or disable parent entries.
     for (const kind of kinds)
         validateDependencies(kind, result[kind]);

package/dist/toolboxCatalogs.d.ts

@@ -0,0 +1,8 @@
+export interface ToolboxCatalogConfig {
+    url?: string;
+    label?: string;
+    enabled?: boolean;
+}
+export type ToolboxCatalogConfigs = Record<string, ToolboxCatalogConfig>;
+/** Stable keys let child presets patch or disable a parent directory through defaults merging. */
+export declare function parseToolboxCatalogs(input: unknown): ToolboxCatalogConfigs;

package/dist/toolboxCatalogs.js

@@ -0,0 +1,34 @@
+import { isJsonObject, PresetError } from './manifest.js';
+/** Stable keys let child presets patch or disable a parent directory through defaults merging. */
+export function parseToolboxCatalogs(input) {
+    if (input === undefined)
+        return {};
+    function invalid() { throw new PresetError('PRESET_INVALID', 'Invalid extension.toolCatalogs configuration'); }
+    if (!isJsonObject(input) || Object.keys(input).length > 16)
+        invalid();
+    return Object.fromEntries(Object.entries(input).map(([id, entry]) => {
+        if (!/^[a-z][a-z0-9-]{0,63}$/.test(id) || id === 'official' || !isJsonObject(entry) || Object.keys(entry).some(key => !['url', 'label', 'enabled'].includes(key)))
+            invalid();
+        if (entry.enabled !== undefined && typeof entry.enabled !== 'boolean')
+            invalid();
+        if (entry.label !== undefined && (typeof entry.label !== 'string' || !entry.label.trim() || entry.label.length > 120))
+            invalid();
+        let url;
+        if (entry.url !== undefined) {
+            if (typeof entry.url !== 'string' || entry.url.length > 2048)
+                invalid();
+            try {
+                const parsed = new URL(entry.url);
+                if (parsed.username || parsed.password || parsed.hash || !(parsed.protocol === 'https:' || parsed.protocol === 'http:' && ['localhost', '127.0.0.1', '[::1]'].includes(parsed.hostname)))
+                    invalid();
+                url = parsed.href;
+            }
+            catch {
+                invalid();
+            }
+        }
+        else if (entry.enabled !== false)
+            invalid();
+        return [id, { ...(url ? { url } : {}), ...(entry.label !== undefined ? { label: entry.label } : {}), ...(entry.enabled !== undefined ? { enabled: entry.enabled } : {}) }];
+    }));
+}

package/dist/types.d.ts

@@ -11,7 +11,8 @@ export interface PresetComponent {
     /** Previous Skill sources eligible for migration only when setup owns the installation. */
     migrateFrom?: string[];
     enabled?: boolean;
-    runtimes?: PresetRuntime[];
+    /** Optional activation subset; supported locations are defined by the package. */
+    targets?: PresetRuntime[];
     dependsOn?: string[];
 }
 export interface PresetReference {

package/installation-site.json

@@ -1,4 +1,4 @@
 {
-  "url": "https://f-loat.github.io/mearl/",
+  "url": "https://mearlhq.github.io/mearl/",
   "extensionId": "aoehhjnofngknnjefamjbplchbolghkm"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mearl/preset",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.7",
   "description": "Browser-compatible preset validation, inheritance and capability resolution for Mearl",
   "type": "module",
   "license": "Apache-2.0",
@@ -19,7 +19,11 @@
       "types": "./dist/installation.d.ts",
       "import": "./dist/installation.js"
     },
-    "./installation-site.json": "./installation-site.json"
+    "./installation-site.json": "./installation-site.json",
+    "./networkRoutes": {
+      "types": "./dist/networkRoutes.d.ts",
+      "import": "./dist/networkRoutes.js"
+    }
   },
   "files": [
     "dist",
@@ -34,7 +38,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/F-loat/mearl.git",
+    "url": "git+https://github.com/mearlhq/mearl.git",
     "directory": "packages/preset"
   },
   "scripts": {