create-foldkit-app 0.19.0 → 0.19.1

package/dist/utils/packages.js

@@ -1,21 +1,24 @@
-import { Array, Effect, Match, Record, Schema, pipe } from 'effect';
+import { Array, Effect, FileSystem, Match, Order, Path, Record, Result, Schema, pipe, } from 'effect';
 import { HttpClient, HttpClientRequest } from 'effect/unstable/http';
 import { spawn } from 'node:child_process';
 const GITHUB_RAW_BASE_URL = 'https://raw.githubusercontent.com/foldkit/foldkit/main/examples';
+const NPM_REGISTRY_BASE_URL = 'https://registry.npmjs.org';
+const FOLDKIT_SCOPE_PREFIX = '@foldkit/';
 const isWindows = process.platform === 'win32';
-const getInstallArgs = (packageManager, isDev = false) => pipe(Match.value(packageManager), Match.when('npm', () => ['install']), Match.when('yarn', () => ['add']), Match.when('pnpm', () => ['add']), Match.when('bun', () => ['add']), Match.exhaustive, args => (isDev ? [...args, '-D'] : args));
 const StringRecord = Schema.Record(Schema.String, Schema.String);
 const PackageJson = Schema.Struct({
     dependencies: StringRecord.pipe(Schema.withDecodingDefaultKey(Effect.succeed({}))),
     devDependencies: StringRecord.pipe(Schema.withDecodingDefaultKey(Effect.succeed({}))),
 });
-// NOTE: foldkit workspace packages an example may depend on that aren't
-// already installed at `latest` by the hardcoded commands below. They ship
-// from the same monorepo, so pin them to `latest` like `foldkit` itself.
-const PASS_THROUGH_WORKSPACE_PACKAGES = new Set([
-    '@foldkit/ui',
-    '@foldkit/devtools',
-]);
+const ProjectPackageJson = Schema.Struct({
+    name: Schema.String,
+    version: Schema.String,
+    type: Schema.String,
+    scripts: StringRecord,
+});
+const NpmPackument = Schema.Struct({
+    version: Schema.String,
+});
 const TEMPLATE_DEV_DEPENDENCIES = [
     '@foldkit/vite-plugin',
     '@foldkit/devtools-mcp',
@@ -26,18 +29,73 @@ const TEMPLATE_DEV_DEPENDENCIES = [
     'prettier',
     'vitest',
 ];
-const formatDeps = (deps) => pipe(deps, Record.toEntries, Array.filter(([name, version]) => !version.includes('workspace:') ||
-    PASS_THROUGH_WORKSPACE_PACKAGES.has(name)), Array.map(([name, version]) => version.includes('workspace:') ? `${name}@latest` : `${name}@${version}`));
-const fetchExampleDeps = (example) => Effect.gen(function* () {
+const isFoldkitPackage = (name) => name === 'foldkit' || name.startsWith(FOLDKIT_SCOPE_PREFIX);
+const Keep = (version) => ({ _tag: 'Keep', version });
+const Latest = { _tag: 'Latest' };
+const toUnresolvedSpec = (spec, name) => {
+    if (spec.includes('workspace:')) {
+        return isFoldkitPackage(name) ? Result.succeed(Latest) : Result.failVoid;
+    }
+    else {
+        return Result.succeed(Keep(spec));
+    }
+};
+/**
+ * Build the runtime dependency map for a scaffolded project from an example's
+ * raw `dependencies`. Concrete versions are kept, Foldkit monorepo packages are
+ * marked for latest-version resolution, and any other workspace packages (which
+ * are not published) are dropped.
+ */
+export const buildUnresolvedDeps = (exampleDeps) => Record.filterMap(exampleDeps, toUnresolvedSpec);
+/**
+ * Build the devDependency map for a scaffolded project by merging the always-on
+ * template tooling with the example's own `devDependencies`. A concrete version
+ * from the example wins over the template's latest marker for the same package.
+ */
+export const buildUnresolvedDevDeps = (exampleDevDeps) => {
+    const templateSpecs = Record.fromIterableWith(TEMPLATE_DEV_DEPENDENCIES, name => [name, Latest]);
+    const exampleSpecs = Record.filterMap(exampleDevDeps, toUnresolvedSpec);
+    return Record.union(templateSpecs, exampleSpecs, (_templateSpec, exampleSpec) => exampleSpec);
+};
+const resolveLatestVersion = (name) => Effect.gen(function* () {
+    const client = yield* HttpClient.HttpClient;
+    const encodedName = name.replace('/', '%2F');
+    const url = `${NPM_REGISTRY_BASE_URL}/${encodedName}/latest`;
+    const response = yield* client.execute(HttpClientRequest.get(url));
+    const json = yield* response.json;
+    const packument = yield* Schema.decodeUnknownEffect(NpmPackument)(json);
+    return `^${packument.version}`;
+});
+const resolveEntry = (name, spec) => Match.value(spec).pipe(Match.tagsExhaustive({
+    Keep: ({ version }) => Effect.succeed([name, version]),
+    Latest: () => Effect.map(resolveLatestVersion(name), version => [name, version]),
+}));
+const resolveSpecs = (unresolved) => Effect.gen(function* () {
+    const entries = Record.toEntries(unresolved);
+    const resolved = yield* Effect.forEach(entries, ([name, spec]) => resolveEntry(name, spec), { concurrency: 'unbounded' });
+    return Record.fromEntries(resolved);
+});
+const byPackageName = Order.mapInput(Order.String, ([name]) => name);
+const sortDependencies = (dependencies) => pipe(dependencies, Record.toEntries, Array.sort(byPackageName), Record.fromEntries);
+const fetchExamplePackageJson = (example) => Effect.gen(function* () {
     const client = yield* HttpClient.HttpClient;
     const url = `${GITHUB_RAW_BASE_URL}/${example}/package.json`;
     const response = yield* client.execute(HttpClientRequest.get(url));
     const json = yield* response.json;
-    const packageJson = yield* Schema.decodeUnknownEffect(PackageJson)(json);
-    return {
-        dependencies: formatDeps(packageJson.dependencies),
-        devDependencies: formatDeps(packageJson.devDependencies),
+    return yield* Schema.decodeUnknownEffect(PackageJson)(json);
+});
+const writeManifest = (projectPath, dependencies, devDependencies) => Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const packageJsonPath = path.join(projectPath, 'package.json');
+    const content = yield* fs.readFileString(packageJsonPath);
+    const packageJson = yield* Schema.decodeUnknownEffect(ProjectPackageJson)(JSON.parse(content));
+    const updated = {
+        ...packageJson,
+        dependencies,
+        devDependencies,
     };
+    yield* fs.writeFileString(packageJsonPath, `${JSON.stringify(updated, null, 2)}\n`);
 });
 const runCommand = (command, args, cwd) => Effect.callback((resume) => {
     const child = spawn(command, [...args], {
@@ -64,13 +122,9 @@ const runCommand = (command, args, cwd) => Effect.callback((resume) => {
     });
 });
 export const installDependencies = (projectPath, packageManager, example) => Effect.gen(function* () {
-    const exampleDeps = yield* fetchExampleDeps(example);
-    const installArgs = getInstallArgs(packageManager);
-    yield* runCommand(packageManager, [...installArgs, 'foldkit', ...exampleDeps.dependencies], projectPath);
-    const installDevArgs = getInstallArgs(packageManager, true);
-    yield* runCommand(packageManager, [
-        ...installDevArgs,
-        ...TEMPLATE_DEV_DEPENDENCIES,
-        ...exampleDeps.devDependencies,
-    ], projectPath);
+    const examplePackageJson = yield* fetchExamplePackageJson(example);
+    const dependencies = yield* resolveSpecs(buildUnresolvedDeps(examplePackageJson.dependencies));
+    const devDependencies = yield* resolveSpecs(buildUnresolvedDevDeps(examplePackageJson.devDependencies));
+    yield* writeManifest(projectPath, sortDependencies(dependencies), sortDependencies(devDependencies));
+    yield* runCommand(packageManager, ['install'], projectPath);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-foldkit-app",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "description": "Create Foldkit applications",
   "type": "module",
   "main": "./dist/index.js",
@@ -20,7 +20,9 @@
     "typescript": "^6.0.3"
   },
   "devDependencies": {
-    "@types/node": "^25.9.3"
+    "@effect/vitest": "4.0.0-beta.88",
+    "@types/node": "^25.9.3",
+    "vitest": "^4.1.9"
   },
   "keywords": [
     "create-foldkit-app",
@@ -47,6 +49,7 @@
     "clean": "rimraf dist *.tsbuildinfo",
     "build": "pnpm run clean && tsc -b",
     "format": "prettier -w .",
+    "test": "vitest run",
     "typecheck": "tsc -b --noEmit"
   }
 }