@salty-css/core 0.1.0-alpha.6 → 0.1.0-alpha.8

package/bin/context.d.ts

@@ -1,7 +1,7 @@
 import { RCFile } from '../types/cli-types';
 import { PackageJson } from './package-json';
 export interface ProjectContext {
-    rootDir: string;
+    cwd: string;
     projectDir: string;
     relativeProjectPath: string;
     packageJson?: PackageJson;

package/bin/frameworks/types.d.ts

@@ -11,6 +11,8 @@ export interface ComponentTemplates {
 }
 export interface FrameworkAdapter {
     name: FrameworkName;
+    /** The path to the framework's source files. */
+    srcDirectory: string;
     /** True when this framework matches the project. Adapters are evaluated in registry order. */
     detect(ctx: ProjectContext): Promise<boolean> | boolean;
     /** The runtime npm spec to install for this framework, e.g. `@salty-css/react@1.2.3`. */

package/bin/main.cjs

@@ -85,27 +85,28 @@ const getDefaultProject = async (rootDir = process.cwd()) => {
   return rc.defaultProject;
 };
 const upsertProjectInRc = (existingRaw, relativeProjectPath, framework) => {
+  const projectPath = path.join(relativeProjectPath, framework.srcDirectory);
   if (existingRaw === void 0) {
     const fresh = {
       $schema: SALTYRC_SCHEMA,
       info: SALTYRC_INFO,
-      defaultProject: relativeProjectPath,
-      projects: [{ dir: relativeProjectPath, framework }]
+      defaultProject: projectPath,
+      projects: [{ dir: projectPath, framework: framework.name }]
     };
     return { content: JSON.stringify(fresh, null, 2), changed: true, created: true };
   }
   const rc = JSON.parse(existingRaw);
   const projects = rc.projects || [];
-  const exists = projects.some((p) => p.dir === relativeProjectPath);
+  const exists = projects.some((p) => p.dir === projectPath);
   if (exists) return { content: existingRaw, changed: false, created: false };
-  projects.push({ dir: relativeProjectPath, framework });
+  projects.push({ dir: projectPath, framework: framework.name });
   rc.projects = [...projects];
   const next = JSON.stringify(rc, null, 2);
   return { content: next, changed: next !== existingRaw, created: false };
 };
-const writeProjectToRc = async (rootDir, relativeProjectPath, framework) => {
-  const path2 = saltyrcPath(rootDir);
-  const existing = await readRawRc(rootDir);
+const writeProjectToRc = async (cwd, relativeProjectPath, framework) => {
+  const path2 = saltyrcPath(cwd);
+  const existing = await readRawRc(cwd);
   const { content, changed, created } = upsertProjectInRc(existing, relativeProjectPath, framework);
   if (!changed) return false;
   if (created) compiler_saltyCompiler.logger.info("Creating file: " + path2);
@@ -124,17 +125,17 @@ const resolveProjectDir = (dir, rootDir = process.cwd()) => {
   return path.join(rootDir, dirName);
 };
 const buildContext = async (opts) => {
-  const rootDir = process.cwd();
-  const projectDir = resolveProjectDir(opts.dir, rootDir);
-  const relativeProjectPath = path.relative(rootDir, projectDir) || ".";
+  const cwd = process.cwd();
+  const projectDir = resolveProjectDir(opts.dir, cwd);
+  const relativeProjectPath = path.relative(cwd, projectDir) || ".";
   const packageJson = await readPackageJson().catch(() => void 0);
   if (opts.requirePackageJson !== false && !packageJson) {
     throw new Error("Salty CSS project must be initialized in a directory with a package.json file.");
   }
-  const rcFile = await readRc(rootDir);
+  const rcFile = await readRc(cwd);
   const cliPackageJson = await readThisPackageJson();
   return {
-    rootDir,
+    cwd,
     projectDir,
     relativeProjectPath,
     packageJson,
@@ -181,6 +182,7 @@ const hasAstroDependency = (ctx) => {
 };
 const astroFramework = {
   name: "astro",
+  srcDirectory: "src",
   detect: (ctx) => Boolean(findAstroConfig(ctx.projectDir)) || hasAstroDependency(ctx),
   runtimePackage: (version) => `@salty-css/astro@${version}`,
   templates: {
@@ -194,6 +196,7 @@ const astroFramework = {
 };
 const reactFramework = {
   name: "react",
+  srcDirectory: "",
   detect: () => true,
   // default fallback — evaluated last in the registry
   runtimePackage: (version) => `@salty-css/react@${version}`,
@@ -402,7 +405,7 @@ ${existing}`;
 const eslintIntegration = {
   name: "eslint",
   detect: (ctx) => {
-    const candidates = eslintConfigCandidates(ctx.projectDir, ctx.rootDir);
+    const candidates = eslintConfigCandidates(ctx.projectDir, ctx.cwd);
     return candidates.find((p) => fs.existsSync(p)) ?? null;
   },
   apply: async (ctx, configPath) => {
@@ -561,8 +564,8 @@ const registerInitCommand = (program) => {
       const projectFiles = await Promise.all([readTemplate("salty.config.ts"), readTemplate("saltygen/index.css")]);
       await promises.mkdir(ctx.projectDir, { recursive: true });
       await Promise.all(projectFiles.map(({ fileName, content }) => writeProjectFile(ctx.projectDir, fileName, content)));
-      await writeProjectToRc(ctx.rootDir, ctx.relativeProjectPath, framework.name);
-      await ensureGitignoreSaltygen(ctx.rootDir);
+      await writeProjectToRc(ctx.cwd, ctx.relativeProjectPath, framework);
+      await ensureGitignoreSaltygen(ctx.cwd);
       await importSaltygenIntoCss(ctx.projectDir, opts.cssFile);
       await detectAndApplyIntegrations(ctx);
       await wirePrepareScript();

package/bin/main.js

@@ -82,27 +82,28 @@ const getDefaultProject = async (rootDir = process.cwd()) => {
   return rc.defaultProject;
 };
 const upsertProjectInRc = (existingRaw, relativeProjectPath, framework) => {
+  const projectPath = join(relativeProjectPath, framework.srcDirectory);
   if (existingRaw === void 0) {
     const fresh = {
       $schema: SALTYRC_SCHEMA,
       info: SALTYRC_INFO,
-      defaultProject: relativeProjectPath,
-      projects: [{ dir: relativeProjectPath, framework }]
+      defaultProject: projectPath,
+      projects: [{ dir: projectPath, framework: framework.name }]
     };
     return { content: JSON.stringify(fresh, null, 2), changed: true, created: true };
   }
   const rc = JSON.parse(existingRaw);
   const projects = rc.projects || [];
-  const exists = projects.some((p) => p.dir === relativeProjectPath);
+  const exists = projects.some((p) => p.dir === projectPath);
   if (exists) return { content: existingRaw, changed: false, created: false };
-  projects.push({ dir: relativeProjectPath, framework });
+  projects.push({ dir: projectPath, framework: framework.name });
   rc.projects = [...projects];
   const next = JSON.stringify(rc, null, 2);
   return { content: next, changed: next !== existingRaw, created: false };
 };
-const writeProjectToRc = async (rootDir, relativeProjectPath, framework) => {
-  const path = saltyrcPath(rootDir);
-  const existing = await readRawRc(rootDir);
+const writeProjectToRc = async (cwd, relativeProjectPath, framework) => {
+  const path = saltyrcPath(cwd);
+  const existing = await readRawRc(cwd);
   const { content, changed, created } = upsertProjectInRc(existing, relativeProjectPath, framework);
   if (!changed) return false;
   if (created) logger.info("Creating file: " + path);
@@ -121,17 +122,17 @@ const resolveProjectDir = (dir, rootDir = process.cwd()) => {
   return join(rootDir, dirName);
 };
 const buildContext = async (opts) => {
-  const rootDir = process.cwd();
-  const projectDir = resolveProjectDir(opts.dir, rootDir);
-  const relativeProjectPath = relative(rootDir, projectDir) || ".";
+  const cwd = process.cwd();
+  const projectDir = resolveProjectDir(opts.dir, cwd);
+  const relativeProjectPath = relative(cwd, projectDir) || ".";
   const packageJson = await readPackageJson().catch(() => void 0);
   if (opts.requirePackageJson !== false && !packageJson) {
     throw new Error("Salty CSS project must be initialized in a directory with a package.json file.");
   }
-  const rcFile = await readRc(rootDir);
+  const rcFile = await readRc(cwd);
   const cliPackageJson = await readThisPackageJson();
   return {
-    rootDir,
+    cwd,
     projectDir,
     relativeProjectPath,
     packageJson,
@@ -178,6 +179,7 @@ const hasAstroDependency = (ctx) => {
 };
 const astroFramework = {
   name: "astro",
+  srcDirectory: "src",
   detect: (ctx) => Boolean(findAstroConfig(ctx.projectDir)) || hasAstroDependency(ctx),
   runtimePackage: (version) => `@salty-css/astro@${version}`,
   templates: {
@@ -191,6 +193,7 @@ const astroFramework = {
 };
 const reactFramework = {
   name: "react",
+  srcDirectory: "",
   detect: () => true,
   // default fallback — evaluated last in the registry
   runtimePackage: (version) => `@salty-css/react@${version}`,
@@ -399,7 +402,7 @@ ${existing}`;
 const eslintIntegration = {
   name: "eslint",
   detect: (ctx) => {
-    const candidates = eslintConfigCandidates(ctx.projectDir, ctx.rootDir);
+    const candidates = eslintConfigCandidates(ctx.projectDir, ctx.cwd);
     return candidates.find((p) => existsSync(p)) ?? null;
   },
   apply: async (ctx, configPath) => {
@@ -558,8 +561,8 @@ const registerInitCommand = (program) => {
       const projectFiles = await Promise.all([readTemplate("salty.config.ts"), readTemplate("saltygen/index.css")]);
       await mkdir(ctx.projectDir, { recursive: true });
       await Promise.all(projectFiles.map(({ fileName, content }) => writeProjectFile(ctx.projectDir, fileName, content)));
-      await writeProjectToRc(ctx.rootDir, ctx.relativeProjectPath, framework.name);
-      await ensureGitignoreSaltygen(ctx.rootDir);
+      await writeProjectToRc(ctx.cwd, ctx.relativeProjectPath, framework);
+      await ensureGitignoreSaltygen(ctx.cwd);
       await importSaltygenIntoCss(ctx.projectDir, opts.cssFile);
       await detectAndApplyIntegrations(ctx);
       await wirePrepareScript();

package/bin/saltyrc.d.ts

@@ -1,4 +1,5 @@
 import { RCFile } from '../types/cli-types';
+import { FrameworkAdapter } from './frameworks';
 export declare const SALTYRC_FILENAME = ".saltyrc.json";
 export declare const SALTYRC_SCHEMA = "./node_modules/@salty-css/core/.saltyrc.schema.json";
 export declare const SALTYRC_INFO = "This file is used to define projects and their configurations for Salty CSS cli. Do not delete, modify or add this file to .gitignore.";
@@ -17,7 +18,7 @@ export declare const getDefaultProject: (rootDir?: string) => Promise<string | u
  * - If the project entry already exists, returns the same content (no-op).
  * - Otherwise appends the new entry and returns updated content.
  */
-export declare const upsertProjectInRc: (existingRaw: string | undefined, relativeProjectPath: string, framework: string) => {
+export declare const upsertProjectInRc: (existingRaw: string | undefined, relativeProjectPath: string, framework: FrameworkAdapter) => {
     content: string;
     changed: boolean;
     created: boolean;
@@ -26,5 +27,5 @@ export declare const upsertProjectInRc: (existingRaw: string | undefined, relati
  * Writes the saltyrc file, creating or updating the project entry for the given dir.
  * Returns true when a write occurred.
  */
-export declare const writeProjectToRc: (rootDir: string, relativeProjectPath: string, framework: string) => Promise<boolean>;
+export declare const writeProjectToRc: (cwd: string, relativeProjectPath: string, framework: FrameworkAdapter) => Promise<boolean>;
 export declare const getProjectFramework: (rc: RCFile, relativeProjectPath: string) => string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salty-css/core",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0-alpha.8",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "typings": "./dist/index.d.ts",