@flareapp/svelte 2.4.0 → 2.5.0

package/dist/FlareErrorBoundary.svelte

@@ -8,6 +8,7 @@
         children: Snippet;
         failed?: Snippet<[error: Error, reset: () => void]>;
         resetKeys?: unknown[];
+        flare?: FlareErrorHandlerOptions['flare'];
         beforeEvaluate?: FlareErrorHandlerOptions['beforeEvaluate'];
         beforeSubmit?: FlareErrorHandlerOptions['beforeSubmit'];
         afterSubmit?: FlareErrorHandlerOptions['afterSubmit'];
@@ -18,6 +19,7 @@
         children,
         failed: fallbackSnippet,
         resetKeys,
+        flare,
         beforeEvaluate,
         beforeSubmit,
         afterSubmit,
@@ -55,7 +57,7 @@
     const ancestor = __flareRegisterComponent('FlareErrorBoundary', '@flareapp/svelte/FlareErrorBoundary.svelte');
 
     const handler = $derived(
-        createFlareErrorHandler({ ancestor, beforeEvaluate, beforeSubmit, afterSubmit }),
+        createFlareErrorHandler({ ancestor, flare, beforeEvaluate, beforeSubmit, afterSubmit }),
     );
 
     function onerror(rawError: unknown, reset: () => void) {

package/dist/FlareErrorBoundary.svelte.d.ts

@@ -4,6 +4,7 @@ interface Props {
     children: Snippet;
     failed?: Snippet<[error: Error, reset: () => void]>;
     resetKeys?: unknown[];
+    flare?: FlareErrorHandlerOptions['flare'];
     beforeEvaluate?: FlareErrorHandlerOptions['beforeEvaluate'];
     beforeSubmit?: FlareErrorHandlerOptions['beforeSubmit'];
     afterSubmit?: FlareErrorHandlerOptions['afterSubmit'];

package/dist/config.d.ts

@@ -7,6 +7,7 @@ interface SvelteConfig {
 export interface WithFlareConfigOptions {
     componentTracking?: boolean;
     exclude?: FlarePreprocessorOptions['exclude'];
+    importSource?: string;
 }
 export declare function withFlareConfig(config: SvelteConfig, options?: WithFlareConfigOptions): SvelteConfig;
 export { flarePreprocessor, type FlarePreprocessorOptions } from './preprocessor.js';

package/dist/config.js

@@ -1,6 +1,6 @@
 import { flarePreprocessor } from './preprocessor.js';
 export function withFlareConfig(config, options) {
-    const { componentTracking = true, exclude } = options ?? {};
+    const { componentTracking = true, exclude, importSource } = options ?? {};
     if (!componentTracking) {
         return config;
     }
@@ -8,7 +8,7 @@ export function withFlareConfig(config, options) {
     if (existing.some((p) => !!p.__flareId)) {
         return config;
     }
-    const preprocessor = flarePreprocessor({ exclude });
+    const preprocessor = flarePreprocessor({ exclude, importSource });
     preprocessor.__flareId = true;
     return {
         ...config,

package/dist/contextToAttributes.d.ts

@@ -1,3 +1,3 @@
-import type { Attributes } from '@flareapp/js';
+import type { Attributes } from '@flareapp/core';
 import type { FlareSvelteContext } from './types.js';
 export declare function contextToAttributes(context: FlareSvelteContext): Attributes;

package/dist/createFlareErrorHandler.d.ts

@@ -1,6 +1,8 @@
+import type { Flare } from '@flareapp/js/browser';
 import type { ComponentTreeNode } from './componentTree.js';
 import type { FlareSvelteContext } from './types.js';
 export interface FlareErrorHandlerOptions {
+    flare?: Flare;
     ancestor?: ComponentTreeNode | null;
     beforeEvaluate?: (params: {
         error: Error;

package/dist/createFlareErrorHandler.js

@@ -1,11 +1,13 @@
-import { convertToError, flare } from '@flareapp/js';
+import { convertToError } from '@flareapp/core';
 import ErrorStackParser from 'error-stack-parser';
 import { contextToAttributes } from './contextToAttributes.js';
 import { extractComponentInfo } from './extractComponentInfo.js';
 import { getErrorOrigin } from './getErrorOrigin.js';
-import { registerSvelteSdkIdentity } from './identify.js';
-registerSvelteSdkIdentity();
+import { tagSvelteFramework } from './identify.js';
+import { resolveFlare } from './resolveFlare.js';
 export function createFlareErrorHandler(options) {
+    const flare = resolveFlare(options?.flare);
+    tagSvelteFramework(flare);
     return async (rawError, _reset) => {
         const error = convertToError(rawError);
         options?.beforeEvaluate?.({ error });

package/dist/identify.d.ts

@@ -1 +1,3 @@
-export declare function registerSvelteSdkIdentity(): void;
+import type { Flare } from '@flareapp/js/browser';
+export declare function registerSvelteSdkIdentity(flare: Flare): void;
+export declare function tagSvelteFramework(flare: Flare): void;

package/dist/identify.js

@@ -1,10 +1,22 @@
-import { flare } from '@flareapp/js';
 import { PACKAGE_VERSION } from './version.js';
-let registered = false;
-export function registerSvelteSdkIdentity() {
-    if (registered)
+// Per-instance guards. A boolean cannot serve injection: with a singleton AND an
+// injected RendererFlare, each instance must be tagged independently.
+const sdkTagged = new WeakSet();
+const frameworkTagged = new WeakSet();
+// Web path: full identity on the default singleton (sdk + framework). Svelte's framework has no version.
+export function registerSvelteSdkIdentity(flare) {
+    if (!sdkTagged.has(flare)) {
+        sdkTagged.add(flare);
+        flare.setSdkInfo({ name: '@flareapp/svelte', version: PACKAGE_VERSION });
+    }
+    tagSvelteFramework(flare);
+}
+// Injected path: framework tag ONLY. Never touch sdkInfo — that would clobber the
+// injected instance's own SDK name (e.g. @flareapp/electron).
+export function tagSvelteFramework(flare) {
+    if (frameworkTagged.has(flare)) {
         return;
-    registered = true;
-    flare.setSdkInfo({ name: '@flareapp/svelte', version: PACKAGE_VERSION });
+    }
+    frameworkTagged.add(flare);
     flare.setFramework({ name: 'Svelte' });
 }

package/dist/index.js

@@ -1,5 +1,13 @@
+import { flare } from '@flareapp/js';
 import { registerSvelteSdkIdentity } from './identify.js';
-registerSvelteSdkIdentity();
+import { registerDefaultFlare } from './resolveFlare.js';
+// Web entry. Importing @flareapp/js runs the root's own side effects (window.flare + global
+// catch) — correct for the web. Register the singleton as the default Flare AND set its SDK
+// identity AT IMPORT. The import-time identity registration is a hard contract: @flareapp/sveltekit
+// does `export * from '@flareapp/svelte'` and overrides the SDK name per-report, relying on this
+// running first (spec Decision 6). Do not defer it.
+registerDefaultFlare(() => flare);
+registerSvelteSdkIdentity(flare);
 export { default as FlareErrorBoundary } from './FlareErrorBoundary.svelte';
 export { createFlareErrorHandler } from './createFlareErrorHandler.js';
 export { __flareRegisterComponent, getComponentTreeContext } from './componentTree.js';

package/dist/inject.d.ts

@@ -0,0 +1,6 @@
+export { default as FlareErrorBoundary } from './FlareErrorBoundary.svelte';
+export { createFlareErrorHandler, type FlareErrorHandlerOptions } from './createFlareErrorHandler.js';
+export { __flareRegisterComponent, getComponentTreeContext } from './componentTree.js';
+export { withFlareConfig, type WithFlareConfigOptions } from './config.js';
+export { flarePreprocessor, type FlarePreprocessorOptions } from './preprocessor.js';
+export type { FlareSvelteContext, SvelteErrorOrigin } from './types.js';

package/dist/inject.js

@@ -0,0 +1,8 @@
+// Electron-safe entry. NO @flareapp/js root import, NO default registration, NO import-time
+// identity. The caller MUST pass `flare` (handler option / boundary prop); resolveFlare throws
+// at wiring time if absent.
+export { default as FlareErrorBoundary } from './FlareErrorBoundary.svelte';
+export { createFlareErrorHandler } from './createFlareErrorHandler.js';
+export { __flareRegisterComponent, getComponentTreeContext } from './componentTree.js';
+export { withFlareConfig } from './config.js';
+export { flarePreprocessor } from './preprocessor.js';

package/dist/preprocessor.d.ts

@@ -1,5 +1,6 @@
 import type { PreprocessorGroup } from 'svelte/compiler';
 export interface FlarePreprocessorOptions {
     exclude?: RegExp;
+    importSource?: string;
 }
 export declare function flarePreprocessor(options?: FlarePreprocessorOptions): PreprocessorGroup;

package/dist/preprocessor.js

@@ -1,5 +1,6 @@
 export function flarePreprocessor(options) {
     const exclude = options?.exclude;
+    const importSource = options?.importSource ?? '@flareapp/svelte';
     return {
         name: 'flare-component-tree',
         markup({ content, filename }) {
@@ -16,7 +17,7 @@ export function flarePreprocessor(options) {
             const componentName = extractComponentName(filename);
             const escapedFile = escapeString(filename);
             const injection = `<script>\n` +
-                `import { __flareRegisterComponent as __flare_reg__ } from '@flareapp/svelte';\n` +
+                `import { __flareRegisterComponent as __flare_reg__ } from '${importSource}';\n` +
                 `const __flare_node__ = __flare_reg__('${componentName}', '${escapedFile}');\n` +
                 `</script>\n`;
             return {
@@ -33,9 +34,17 @@ export function flarePreprocessor(options) {
             if (attributes.context === 'module' || attributes.module != null) {
                 return;
             }
+            // Skip a script the markup hook already injected. For a scriptless component the markup
+            // hook adds a `<script>` with our registration; Svelte then runs THIS script hook over
+            // that injected block within the same preprocessor pass. Without this guard we inject a
+            // second time, producing a duplicate `const __flare_node__` -> "already been declared"
+            // compile error.
+            if (content.includes('__flare_node__')) {
+                return;
+            }
             const componentName = extractComponentName(filename);
             const escapedFile = escapeString(filename);
-            const injection = `import { __flareRegisterComponent as __flare_reg__ } from '@flareapp/svelte';\n` +
+            const injection = `import { __flareRegisterComponent as __flare_reg__ } from '${importSource}';\n` +
                 `const __flare_node__ = __flare_reg__('${componentName}', '${escapedFile}');\n`;
             return {
                 code: injection + content,

package/dist/resolveFlare.d.ts

@@ -0,0 +1,3 @@
+import type { Flare } from '@flareapp/js/browser';
+export declare function registerDefaultFlare(provider: () => Flare): void;
+export declare function resolveFlare(explicit?: Flare): Flare;

package/dist/resolveFlare.js

@@ -0,0 +1,42 @@
+let defaultProvider = null;
+// `process.env.NODE_ENV` is replaced inline by bundlers (vite/webpack). The try/catch keeps a
+// process-less environment safe: treat "undetermined" as production (warn, never crash).
+function isDevMode() {
+    try {
+        return process.env.NODE_ENV !== 'production';
+    }
+    catch {
+        return false;
+    }
+}
+// Called once by the web entry (index.ts) as an import side effect.
+export function registerDefaultFlare(provider) {
+    // Tripwire: a web default registering while the Electron bridge exists means a renderer pulled
+    // the package root — directly, or via component-tracking codegen emitting the root specifier
+    // (set the preprocessor's importSource to '@flareapp/svelte/inject' to avoid that). It drags
+    // the keyed @flareapp/js singleton and its global side effects into the renderer.
+    if (typeof window !== 'undefined' && window.__flare) {
+        const message = '[flare] @flareapp/svelte (web root) was imported in a renderer where the Electron ' +
+            'bridge is present, pulling the keyed @flareapp/js singleton into the renderer. ' +
+            "Import @flareapp/svelte/inject (and set the preprocessor importSource to '@flareapp/svelte/inject') instead.";
+        // Dev: throw so the misconfiguration is impossible to miss. Production: warn instead, so a
+        // shipped app isn't crashed by a (recoverable) reporting-setup mistake.
+        if (isDevMode()) {
+            throw new Error(message);
+        }
+        console.warn(message);
+    }
+    defaultProvider = provider;
+}
+// Resolve at WIRING time (handler creation / component setup), never inside a report path.
+export function resolveFlare(explicit) {
+    if (explicit) {
+        return explicit;
+    }
+    if (defaultProvider) {
+        return defaultProvider();
+    }
+    throw new Error('[flare] No Flare instance available. Pass `flare` (e.g. from ' +
+        '@flareapp/electron/renderer), or import @flareapp/svelte (the package root) ' +
+        'to use the @flareapp/js default singleton.');
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.4.0";
+export declare const PACKAGE_VERSION = "2.5.0";

package/dist/version.js

@@ -1,2 +1,2 @@
 // generated during release, do not modify
-export const PACKAGE_VERSION = '2.4.0';
+export const PACKAGE_VERSION = '2.5.0';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flareapp/svelte",
-    "version": "2.4.0",
+    "version": "2.5.0",
     "description": "Svelte client for flareapp.io",
     "homepage": "https://flareapp.io",
     "bugs": "https://github.com/spatie/flare-client-js/issues",
@@ -42,17 +42,30 @@
                 "types": "./dist/config.d.ts",
                 "default": "./dist/config.js"
             }
+        },
+        "./inject": {
+            "svelte": "./dist/inject.js",
+            "import": {
+                "types": "./dist/inject.d.ts",
+                "default": "./dist/inject.js"
+            }
         }
     },
+    "sideEffects": [
+        "./dist/index.js"
+    ],
     "scripts": {
         "prepublishOnly": "npm run build",
         "generate:version": "node ../../scripts/generate-version.mjs .",
         "build": "npm run generate:version && svelte-package -i src -o dist",
         "test": "vitest run",
+        "verify:exports": "node scripts/verify-exports.mjs",
+        "verify:inject": "node scripts/verify-inject-no-root.mjs",
         "typescript": "tsc --noEmit",
         "release": "release-it"
     },
     "devDependencies": {
+        "@flareapp/electron": "file:../electron",
         "@flareapp/js": "file:../js",
         "@sveltejs/package": "^2.5.7",
         "@sveltejs/vite-plugin-svelte": "^5.0.0",
@@ -63,13 +76,14 @@
         "vitest": "^4.0.0"
     },
     "peerDependencies": {
-        "@flareapp/js": "^2.4.0",
+        "@flareapp/js": "^2.5.0",
         "svelte": "^5.3.0"
     },
     "publishConfig": {
         "access": "public"
     },
     "dependencies": {
+        "@flareapp/core": "2.5.0",
         "error-stack-parser": "^2.1.4"
     }
 }