chore: restructure monorepo

package.json

@@ -33,13 +33,5 @@
 		"node": "22.11.0",
 		"pnpm": "9.14.2"
 	},
-	"pnpm": {
-		"patchedDependencies": {
-			"fixturify-project": "patches/fixturify-project.patch"
-		},
-		"overrides": {
-			"@sveltejs/vite-plugin-svelte": "^4.0.0"
-		}
-	},
 	"packageManager": "[email protected]+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387"
 }

packages/core/.gitignore

@@ -0,0 +1 @@
+dist

packages/svelte/src/lib/handlers/restart.ts → packages/core/handlers/restart.ts

@@ -9,7 +9,7 @@ const handler = (({ max = 1 }: { max?: number } = { max: 1 }) => {
 		if (running_controllers.size >= max) {
 			const first = running_controllers.values().next();
 			first.value?.abort();
-			running_controllers.delete(first.value);
+			running_controllers.delete(first.value!);
 		}
 		running_controllers.add(utils.abort_controller);
 		try {

packages/core/package.json

@@ -0,0 +1,50 @@
+{
+	"name": "@sheepdog/core",
+	"version": "0.0.1",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/mainmatter/sheepdog.git"
+	},
+	"main": "./dist/index.js",
+	"type": "module",
+	"scripts": {
+		"build": "tsc --outDir dist --declaration --sourceMap false && publint",
+		"prepack": "pnpm build",
+		"prepare": "pnpm build"
+	},
+	"files": [
+		"dist"
+	],
+	"exports": {
+		".": {
+			"types": "./dist/index.d.ts",
+			"svelte": "./dist/index.js",
+			"import": "./dist/index.js"
+		},
+		"./utils": {
+			"types": "./dist/utils.d.ts",
+			"svelte": "./dist/utils.js",
+			"import": "./dist/utils.js"
+		},
+		"./vite": {
+			"types": "./dist/vite.d.ts",
+			"svelte": "./dist/vite.js",
+			"import": "./dist/vite.js"
+		}
+	},
+	"types": "./dist/index.d.ts",
+	"svelte": "./dist/index.js",
+	"dependencies": {
+		"acorn": "^8.11.3",
+		"esm-env": "^1.1.4",
+		"esrap": "^1.2.2",
+		"zimmerframe": "^1.1.2"
+	},
+	"volta": {
+		"extends": "../../package.json"
+	},
+	"devDependencies": {
+		"publint": "^0.2.7",
+		"vite": "^5.2.11"
+	}
+}

packages/core/tsconfig.json

@@ -0,0 +1,6 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"composite": true
+	}
+}

packages/core/utils.ts

@@ -0,0 +1,33 @@
+import { DEV } from 'esm-env';
+import { CancelationError } from './index';
+import type { TaskFunction } from './index';
+
+/**
+ * Utility method to know if a `perform` thrown because it was canceled
+ */
+export const didCancel = (e: Error | CancelationError) => {
+	return e instanceof CancelationError;
+};
+
+/**
+ * A Promise that will resolve after {ms} milliseconds
+ */
+export async function timeout(ms: number) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/**
+ * A function to mark your function to be transformable by the
+ * async transform vite plugin. It will error out in dev mode
+ * if you didn't add the plugin.
+ */
+export function transform<TArgs, TReturn>(
+	fn: TaskFunction<TArgs, TReturn>,
+): TaskFunction<TArgs, TReturn> {
+	if (DEV) {
+		throw new Error(
+			'You are using the transform function without the vite plugin. Please add the `asyncTransform` plugin to your `vite.config.ts`',
+		);
+	}
+	return fn;
+}

packages/core/vite.ts

@@ -0,0 +1,144 @@
+import type {
+	ArrowFunctionExpression,
+	AwaitExpression,
+	BlockStatement,
+	CallExpression,
+	FunctionExpression,
+	ImportDeclaration,
+} from 'acorn';
+import type { Plugin } from 'vite';
+
+type Nodes =
+	| ImportDeclaration
+	| FunctionExpression
+	| ArrowFunctionExpression
+	| CallExpression
+	| BlockStatement
+	| AwaitExpression;
+
+export async function asyncTransform() {
+	const { parse } = await import('acorn');
+	const { print } = await import('esrap');
+	const { walk } = await import('zimmerframe');
+
+	return {
+		name: 'sheepdog-async-transform',
+		async transform(code, id) {
+			try {
+				const ast = parse(code, {
+					ecmaVersion: 'latest',
+					locations: true,
+					sourceType: 'module',
+				});
+				let task_fn_name: string;
+				const transform_fn_names = new Set<string>();
+				// let's walk once to find the name (we were using a promise before but that's just messy)
+				walk(
+					ast as unknown as ImportDeclaration,
+					{},
+					{
+						ImportDeclaration(node) {
+							if (
+								node.source.value === '@sheepdog/svelte' ||
+								node.source.value === '@sheepdog/svelte/task' ||
+								node.source.value === '@sheepdog/svelte/utils'
+							) {
+								const task_fn = node.specifiers.find((specifier) => {
+									return (
+										specifier.type === 'ImportSpecifier' &&
+										specifier.imported.type === 'Identifier' &&
+										specifier.imported.name === 'task'
+									);
+								});
+								const transform_fn = node.specifiers.find((specifier) => {
+									return (
+										specifier.type === 'ImportSpecifier' &&
+										specifier.imported.type === 'Identifier' &&
+										specifier.imported.name === 'transform'
+									);
+								});
+								if (transform_fn && transform_fn.type === 'ImportSpecifier') {
+									transform_fn_names.add(transform_fn.local.name);
+								}
+								if (task_fn && task_fn.type === 'ImportSpecifier') {
+									task_fn_name = task_fn.local.name;
+								}
+							}
+						},
+					},
+				);
+				let changed = false;
+				const returned = walk(
+					ast as unknown as Nodes,
+					{
+						transform: false,
+					},
+					{
+						AwaitExpression(node, { next, state }) {
+							if (state.transform) {
+								next();
+								node.type = 'YieldExpression' as never;
+							}
+						},
+						CallExpression(node, { state, next }) {
+							let local_changed = false;
+							let task_arg: (typeof node)['arguments'][number] | undefined;
+							if (
+								(node.callee.type === 'Identifier' &&
+									(node.callee.name === task_fn_name ||
+										transform_fn_names.has(node.callee.name))) ||
+								(node.callee.type === 'MemberExpression' &&
+									node.callee.object.type === 'Identifier' &&
+									node.callee.object.name === task_fn_name)
+							) {
+								task_arg = node.arguments[0];
+								if (task_arg && task_arg.type === 'ArrowFunctionExpression' && task_arg.async) {
+									const to_change = task_arg as unknown as FunctionExpression;
+									to_change.type = 'FunctionExpression';
+									to_change.generator = true;
+									next({ ...state, transform: true });
+									changed = true;
+									local_changed = true;
+								} else if (
+									task_arg &&
+									task_arg.type === 'FunctionExpression' &&
+									!task_arg.generator &&
+									task_arg.async
+								) {
+									const to_change = task_arg as unknown as FunctionExpression;
+									to_change.generator = true;
+									next({ ...state, transform: true });
+									changed = true;
+									local_changed = true;
+								}
+							}
+							if (!local_changed) {
+								next();
+							}
+							if (
+								task_arg &&
+								node.callee.type === 'Identifier' &&
+								transform_fn_names.has(node.callee.name)
+							) {
+								return task_arg as never;
+							}
+						},
+					},
+				) as unknown as typeof ast;
+
+				if (changed) {
+					return {
+						// eslint-disable-next-line @typescript-eslint/no-explicit-any
+						...print(returned as any, {
+							sourceMapContent: code,
+							sourceMapSource: id,
+						}),
+					};
+				}
+			} catch (e) {
+				console.error(e);
+				/** in case parsing fails */
+			}
+		},
+	} satisfies Plugin;
+}

packages/svelte/.npmrc

@@ -1 +1 @@
-engine-strict=true
+engine-strict=true

packages/svelte/package.json

@@ -55,10 +55,7 @@
 		"test:unit:ui": "vitest --ui"
 	},
 	"dependencies": {
-		"acorn": "^8.11.3",
-		"esm-env": "^1.1.4",
-		"esrap": "^1.2.2",
-		"zimmerframe": "^1.1.2"
+		"@sheepdog/core": "workspace:*"
 	},
 	"devDependencies": {
 		"@playwright/test": "^1.44.0",
@@ -78,7 +75,7 @@
 		"eslint-plugin-playwright": "^2.0.0",
 		"eslint-plugin-svelte": "2.46.0",
 		"execa": "^9.4.0",
-		"fixturify-project": "^7.1.2",
+		"fixturify-project": "^7.1.3",
 		"globals": "^15.2.0",
 		"happy-dom": "^15.0.0",
 		"prettier": "^3.2.5",

packages/svelte/src/lib/task.ts

@@ -1,7 +1,13 @@
 import { onDestroy } from 'svelte';
 import { writable } from 'svelte/store';
-import type { HandlerType, HandlersMap, SheepdogUtils, TaskOptions, TaskFunction } from './core';
-import { CancelationError, createTask, handlers } from './core';
+import type {
+	HandlerType,
+	HandlersMap,
+	SheepdogUtils,
+	TaskOptions,
+	TaskFunction,
+} from '@sheepdog/core';
+import { CancelationError, createTask, handlers } from '@sheepdog/core';
 import type { ReadableWithGet, WritableWithGet } from './internal/helpers';
 import { writable_with_get } from './internal/helpers';
 export type { SheepdogUtils, TaskOptions };

packages/svelte/src/lib/utils.ts

@@ -1,33 +1,3 @@
-import { DEV } from 'esm-env';
-import { CancelationError } from './core';
-import type { TaskFunction } from './core';
+import { didCancel, timeout, transform } from '@sheepdog/core/utils';
 
-/**
- * Utility method to know if a `perform` thrown because it was canceled
- */
-export const didCancel = (e: Error | CancelationError) => {
-	return e instanceof CancelationError;
-};
-
-/**
- * A Promise that will resolve after {ms} milliseconds
- */
-export async function timeout(ms: number) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-/**
- * A function to mark your function to be transformable by the
- * async transform vite plugin. It will error out in dev mode
- * if you didn't add the plugin.
- */
-export function transform<TArgs, TReturn>(
-	fn: TaskFunction<TArgs, TReturn>,
-): TaskFunction<TArgs, TReturn> {
-	if (DEV) {
-		throw new Error(
-			'You are using the transform function without the vite plugin. Please add the `asyncTransform` plugin to your `vite.config.ts`',
-		);
-	}
-	return fn;
-}
+export { didCancel, timeout, transform };