@wuchale/svelte 0.16.6 → 0.17.0

package/dist/index.d.ts

@@ -1,6 +1,14 @@
-import type { HeuristicFunc, Adapter, AdapterArgs } from 'wuchale';
+import type { HeuristicFunc, Adapter, AdapterArgs, LoaderChoice, CreateHeuristicOpts } from 'wuchale';
+export declare function createSvelteHeuristic(opts: CreateHeuristicOpts): HeuristicFunc;
 /** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
 export declare const svelteDefaultHeuristic: HeuristicFunc;
+export declare const svelteKitDefaultHeuristic: HeuristicFunc;
 /** Default Svelte heuristic which requires `$derived` or `$derived.by` for top level variable assignments */
 export declare const svelteDefaultHeuristicDerivedReq: HeuristicFunc;
-export declare const adapter: (args?: AdapterArgs) => Adapter;
+type LoadersAvailable = 'svelte' | 'sveltekit';
+export declare function getDefaultLoaderPath(loader: LoaderChoice<LoadersAvailable>, bundle: boolean): string | {
+    client: string;
+    server: string;
+};
+export declare const adapter: (args?: AdapterArgs<LoadersAvailable>) => Adapter;
+export {};

package/dist/index.js

@@ -1,42 +1,52 @@
-import { defaultGenerateLoadID, defaultHeuristic, deepMergeObjects } from 'wuchale';
+import { defaultGenerateLoadID, deepMergeObjects, createHeuristic, defaultHeuristicOpts } from 'wuchale';
 import { SvelteTransformer } from "./transformer.js";
-import { getDependencies, loaderPathResolver } from 'wuchale/adapter-utils';
+import { loaderPathResolver } from 'wuchale/adapter-utils';
 import { pluralPattern } from 'wuchale/adapter-vanilla';
+export function createSvelteHeuristic(opts) {
+    const defaultHeuristic = createHeuristic(opts);
+    return msg => {
+        const defRes = defaultHeuristic(msg);
+        if (!defRes) {
+            return false;
+        }
+        if (msg.details.scope !== 'script') {
+            return defRes;
+        }
+        if (msg.details.call === '$inspect') {
+            return false;
+        }
+        return defRes;
+    };
+}
 /** Default Svelte heuristic which extracts top level variable assignments as well, leading to `$derived` being auto added when needed */
-export const svelteDefaultHeuristic = msg => {
-    if (!defaultHeuristic(msg)) {
-        return false;
-    }
-    if (msg.details.scope !== 'script') {
-        return true;
-    }
-    if (msg.details.call === '$inspect') {
-        return false;
-    }
-    return true;
-};
+export const svelteDefaultHeuristic = createSvelteHeuristic(defaultHeuristicOpts);
+export const svelteKitDefaultHeuristic = createSvelteHeuristic({ ...defaultHeuristicOpts, urlCalls: ['goto'] });
 /** Default Svelte heuristic which requires `$derived` or `$derived.by` for top level variable assignments */
 export const svelteDefaultHeuristicDerivedReq = msg => {
-    if (!svelteDefaultHeuristic(msg)) {
+    const defRes = svelteDefaultHeuristic(msg);
+    if (!defRes) {
         return false;
     }
     if (msg.details.scope !== 'script' || msg.details.declaring !== 'variable') {
-        return true;
+        return defRes;
     }
     if (!msg.details.topLevelCall) {
         return false;
     }
-    return ['$derived', '$derived.by'].includes(msg.details.topLevelCall);
+    if (['$derived', '$derived.by'].includes(msg.details.topLevelCall)) {
+        return defRes;
+    }
+    return false;
 };
 const defaultArgs = {
     files: ['src/**/*.svelte', 'src/**/*.svelte.{js,ts}'],
-    catalog: './src/locales/{locale}',
+    localesDir: './src/locales',
     patterns: [pluralPattern],
-    heuristic: svelteDefaultHeuristic,
+    heuristic: svelteKitDefaultHeuristic,
     granularLoad: false,
     bundleLoad: false,
     generateLoadID: defaultGenerateLoadID,
-    writeFiles: {},
+    loader: 'svelte',
     runtime: {
         useReactive: ({ file, funcName, additional }) => {
             const inTopLevel = funcName == null;
@@ -47,47 +57,37 @@ const defaultArgs = {
             };
         },
         reactive: {
-            importName: 'default',
             wrapInit: expr => `$derived(${expr})`,
             wrapUse: expr => expr,
         },
         plain: {
-            importName: 'get',
             wrapInit: expr => expr,
             wrapUse: expr => expr,
         },
     },
 };
 const resolveLoaderPath = loaderPathResolver(import.meta.url, '../src/loaders', 'svelte.js');
+export function getDefaultLoaderPath(loader, bundle) {
+    if (bundle) {
+        return resolveLoaderPath('bundle');
+    }
+    if (loader === 'sveltekit') {
+        return {
+            client: resolveLoaderPath('svelte'),
+            server: resolveLoaderPath('sveltekit.ssr'),
+        };
+    }
+    return resolveLoaderPath(loader);
+}
 export const adapter = (args = defaultArgs) => {
-    const { heuristic, patterns, runtime, ...rest } = deepMergeObjects(args, defaultArgs);
+    const { heuristic, patterns, runtime, loader, ...rest } = deepMergeObjects(args, defaultArgs);
     return {
-        transform: ({ content, filename, index, expr }) => {
-            return new SvelteTransformer(content, filename, index, heuristic, patterns, expr, runtime).transformSv();
+        transform: ({ content, filename, index, expr, matchUrl }) => {
+            return new SvelteTransformer(content, filename, index, heuristic, patterns, expr, runtime, matchUrl).transformSv();
         },
         loaderExts: ['.svelte.js', '.svelte.ts', '.js', '.ts'],
-        defaultLoaders: async () => {
-            if (rest.bundleLoad) {
-                return ['bundle'];
-            }
-            const deps = await getDependencies();
-            const available = ['svelte'];
-            if (deps.has('@sveltejs/kit')) {
-                available.unshift('sveltekit');
-            }
-            return available;
-        },
-        defaultLoaderPath: loader => {
-            if (loader === 'sveltekit') {
-                return {
-                    client: resolveLoaderPath('svelte'),
-                    server: resolveLoaderPath('sveltekit.ssr'),
-                };
-            }
-            return resolveLoaderPath(loader);
-        },
+        defaultLoaderPath: getDefaultLoaderPath(loader, rest.bundleLoad),
         runtime,
         ...rest,
-        docsUrl: 'https://wuchale.dev/adapters/svelte'
     };
 };

package/dist/transformer.d.ts

@@ -13,7 +13,7 @@ export declare class SvelteTransformer extends Transformer {
     currentSnippet: number;
     moduleExportRanges: [number, number][];
     mixedVisitor: MixedVisitor<MixedNodesTypes>;
-    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf);
+    constructor(content: string, filename: string, index: IndexTracker, heuristic: HeuristicFunc, patterns: CodePattern[], catalogExpr: CatalogExpr, rtConf: RuntimeConf, matchUrl: (url: string) => string);
     visitExpressionTag: (node: AST.ExpressionTag) => Message[];
     visitVariableDeclarator: (node: VariableDeclarator) => Message[];
     initMixedVisitor: () => MixedVisitor<MixedNodesTypes>;

package/dist/transformer.js

@@ -16,8 +16,8 @@ export class SvelteTransformer extends Transformer {
     currentSnippet = 0;
     moduleExportRanges = []; // to choose which runtime var to use for snippets
     mixedVisitor;
-    constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf) {
-        super(content, filename, index, heuristic, patterns, catalogExpr, rtConf, [varNames.rt, rtModuleVar]);
+    constructor(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl) {
+        super(content, filename, index, heuristic, patterns, catalogExpr, rtConf, matchUrl, [varNames.rt, rtModuleVar]);
     }
     visitExpressionTag = (node) => this.visit(node.expression);
     visitVariableDeclarator = (node) => {
@@ -64,7 +64,7 @@ export class SvelteTransformer extends Transformer {
         },
         visitExpressionTag: this.visitExpressionTag,
         fullHeuristicDetails: this.fullHeuristicDetails,
-        checkHeuristic: this.checkHeuristicBool,
+        checkHeuristic: this.getHeuristicMessageType,
         index: this.index,
         wrapNested: (msgInfo, hasExprs, nestedRanges, lastChildEnd) => {
             const snippets = [];
@@ -153,14 +153,24 @@ export class SvelteTransformer extends Transformer {
             });
         }
         const value = values[0];
-        if (value.type !== 'Text') {
-            return this.visitSv(value);
-        }
-        const [pass, msgInfo] = this.checkHeuristic(value.data, {
-            scope: 'attribute',
+        const heuDetails = {
+            scope: 'script',
             element: this.currentElement,
             attribute: node.name,
-        });
+        };
+        if (value.type === 'ExpressionTag') {
+            if (value.expression.type === 'Literal') {
+                const expr = value.expression;
+                return this.visitWithCommentDirectives(expr, () => this.visitLiteral(expr, heuDetails));
+            }
+            if (value.expression.type === 'TemplateLiteral') {
+                const expr = value.expression;
+                return this.visitWithCommentDirectives(expr, () => this.visitTemplateLiteral(expr, heuDetails));
+            }
+            return this.visitSv(value);
+        }
+        heuDetails.scope = 'attribute';
+        const [pass, msgInfo] = this.checkHeuristic(value.data, heuDetails);
         if (!pass) {
             return [];
         }
@@ -286,7 +296,7 @@ export class SvelteTransformer extends Transformer {
         if (this.commentDirectives.ignoreFile) {
             return [];
         }
-        if (this.commentDirectives.forceInclude !== false) {
+        if (this.commentDirectives.forceType !== false) {
             msgs = this.visit(node);
         }
         this.commentDirectives = commentDirectivesPrev;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wuchale/svelte",
-    "version": "0.16.6",
+    "version": "0.17.0",
     "description": "Protobuf-like i18n from plain code: Svelte adapter",
     "scripts": {
         "dev": "tsc --watch",
@@ -52,7 +52,7 @@
     "license": "MIT",
     "dependencies": {
         "svelte": "^5.37.0",
-        "wuchale": "^0.17.5"
+        "wuchale": "^0.18.0"
     },
     "devDependencies": {
         "acorn": "^8.15.0",

package/src/loaders/bundle.svelte.js

@@ -1,6 +1,8 @@
 // This is just the default loader.
 // You can customize it however you want, it will not be overwritten once it exists and is not empty.
 
+import toRuntime from "wuchale/runtime"
+
 let locale = $state('en')
 
 /**
@@ -14,7 +16,7 @@ export function setLocale(newLocale) {
 /**
  * @param {{ [locale: string]: import("wuchale/runtime").CatalogModule }} catalogs
 */ 
-export const get = catalogs => catalogs[locale]
+export const getRuntime = catalogs => toRuntime(catalogs[locale], locale)
 
 // same function, only will be inside $derived when used
-export default get
+export const getRuntimeRx = getRuntime

package/src/loaders/svelte.svelte.js

@@ -1,15 +1,15 @@
 // This is just the default loader.
 // You can customize it however you want, it will not be overwritten once it exists and is not empty.
 
-/// <reference types="wuchale/virtual" />
-
-import { loadCatalog, loadIDs, key } from 'virtual:wuchale/proxy' // or proxy/sync
+import { loadCatalog, loadIDs } from '${PROXY}'
 import { registerLoaders, defaultCollection } from 'wuchale/load-utils'
 
-const catalogs = $state({})
+const key = '${KEY}'
+
+const runtimes = $state({})
 
 // for non-reactive
-export const get = registerLoaders(key, loadCatalog, loadIDs, defaultCollection(catalogs))
+export const getRuntime = registerLoaders(key, loadCatalog, loadIDs, defaultCollection(runtimes))
 
 // same function, only will be inside $derived when used
-export default get
+export const getRuntimeRx = getRuntime

package/src/loaders/sveltekit.ssr.svelte.js

@@ -1,15 +1,15 @@
 // This is just the default loader.
 // You can customize it however you want, it will not be overwritten once it exists and is not empty.
 
-/// <reference types="wuchale/virtual" />
+import { loadCatalog, loadIDs } from '${PROXY_SYNC}'
+import { currentRuntime } from 'wuchale/load-utils/server'
 
-import { loadCatalog, loadIDs, key } from 'virtual:wuchale/proxy/sync' // because it's on the server
-import { currentCatalog } from 'wuchale/load-utils/server'
+const key = '${KEY}'
 
 export { loadCatalog, loadIDs, key } // for hooks.server.{js,ts}
 
 // for non-reactive
-export const get = (/** @type {string} */ loadID) => currentCatalog(key, loadID)
+export const getRuntime = (/** @type {string} */ loadID) => currentRuntime(key, loadID)
 
 // same function, only will be inside $derived when used
-export default get
+export const getRuntimeRx = getRuntime