@rocapine/community 0.10.0 → 0.10.2

package/lib/commands/init.js

@@ -95,7 +95,9 @@ async function runInit(options = {}) {
                 continue;
             const destDir = path.join(functionsDestRoot, fnName);
             fs.cpSync(srcDir, destDir, { recursive: true, filter: install_shared_1.isShippedFunctionFile });
-            writtenPaths.push(...(0, install_shared_1.listFilesRecursive)(destDir));
+            // Only what we copied: a host file already in the folder (e.g. `_shared`)
+            // must neither land in the manifest nor be deleted by the rollback below.
+            writtenPaths.push(...(0, install_shared_1.shippedRelFiles)(srcDir).map((rel) => path.join(destDir, rel)));
         }
     }
     catch (err) {

package/lib/commands/upgrade.js

@@ -95,7 +95,7 @@ async function runUpgrade(options = {}) {
         if (!fs.existsSync(destDir)) {
             newFunctions.push(fnName);
         }
-        else if (functionDirDiffers(srcDir, destDir)) {
+        else if (functionDirDiffers(srcDir, destDir, staleFiles(srcDir, destDir, cwd, manifest.installedFiles))) {
             changedFunctions.push(fnName);
         }
     }
@@ -145,15 +145,16 @@ async function runUpgrade(options = {}) {
             createdFunctionDirs.push(destDir);
         }
         for (const fnName of changedFunctions) {
+            const srcDir = path.join(functionsSrcRoot, fnName);
             const destDir = path.join(functionsDestRoot, fnName);
             const backupDir = fs.mkdtempSync(path.join(os.tmpdir(), "community-sdk-upgrade-backup-"));
             fs.cpSync(destDir, backupDir, { recursive: true });
             backups.push({ destDir, backupDir });
-            fs.rmSync(destDir, { recursive: true, force: true });
-            fs.cpSync(path.join(functionsSrcRoot, fnName), destDir, {
-                recursive: true,
-                filter: install_shared_1.isShippedFunctionFile,
-            });
+            // Only the SDK's own files: a host keeps its files in the same folder
+            // (e.g. its own helpers under `_shared/`), so the folder is never wiped.
+            for (const stale of staleFiles(srcDir, destDir, cwd, manifest.installedFiles))
+                fs.rmSync(stale, { force: true });
+            fs.cpSync(srcDir, destDir, { recursive: true, force: true, filter: install_shared_1.isShippedFunctionFile });
         }
     }
     catch (err) {
@@ -179,7 +180,8 @@ async function runUpgrade(options = {}) {
         ...changedFunctions.map((fnName) => path.join(functionsDestRoot, fnName)),
     ];
     const touchedFunctionDirPrefixes = touchedFunctionDirs.map((d) => `${(0, install_shared_1.toRelativePosix)(cwd, d)}/`);
-    const touchedFunctionFiles = touchedFunctionDirs.flatMap((d) => (0, install_shared_1.listFilesRecursive)(d).map((f) => (0, install_shared_1.toRelativePosix)(cwd, f)));
+    // The template's files only — never host files living in the same folder.
+    const touchedFunctionFiles = touchedFunctionDirs.flatMap((d) => (0, install_shared_1.shippedRelFiles)(path.join(functionsSrcRoot, path.basename(d))).map((rel) => (0, install_shared_1.toRelativePosix)(cwd, path.join(d, rel))));
     const survivingOldFiles = manifest.installedFiles.filter((f) => !touchedFunctionDirPrefixes.some((prefix) => f.startsWith(prefix)));
     const installedFiles = [
         ...new Set([...survivingOldFiles, ...touchedFunctionFiles, ...addedMigrations]),
@@ -228,23 +230,25 @@ function reconstructInstalledTemplateIds(installedFiles) {
     }
     return ids;
 }
-function functionDirDiffers(srcDir, destDir) {
-    const rel = (dir) => new Set((0, install_shared_1.listFilesRecursive)(dir)
-        .filter(install_shared_1.isShippedFunctionFile)
-        .map((f) => path.relative(dir, f)));
-    const srcRel = rel(srcDir);
-    const destRel = rel(destDir);
-    if (srcRel.size !== destRel.size)
+/** Files a previous upgrade installed in `destDir` (per the manifest) that the
+ * current template no longer ships. */
+function staleFiles(srcDir, destDir, cwd, installedFiles) {
+    const shipped = new Set((0, install_shared_1.shippedRelFiles)(srcDir).map((rel) => rel.split(path.sep).join("/")));
+    const prefix = `${(0, install_shared_1.toRelativePosix)(cwd, destDir)}/`;
+    return installedFiles
+        .filter((f) => f.startsWith(prefix) && !shipped.has(f.slice(prefix.length)))
+        .map((f) => path.join(cwd, f))
+        .filter((f) => fs.existsSync(f));
+}
+/** True when a template file is missing or different in `destDir`, or an old
+ * SDK file is left over. Files the host added to the folder don't count. */
+function functionDirDiffers(srcDir, destDir, stale) {
+    if (stale.length > 0)
         return true;
-    for (const rel of srcRel) {
-        if (!destRel.has(rel))
-            return true;
-        const a = fs.readFileSync(path.join(srcDir, rel));
-        const b = fs.readFileSync(path.join(destDir, rel));
-        if (!a.equals(b))
-            return true;
-    }
-    return false;
+    return (0, install_shared_1.shippedRelFiles)(srcDir).some((rel) => {
+        const dest = path.join(destDir, rel);
+        return (!fs.existsSync(dest) || !fs.readFileSync(path.join(srcDir, rel)).equals(fs.readFileSync(dest)));
+    });
 }
 function printSummary(log, onWarn, summary) {
     log("");

package/lib/install-shared.d.ts

@@ -54,6 +54,8 @@ export declare function addSeconds(date: Date, seconds: number): Date;
  * functions, and ignored when diffing a host's function dir. */
 export declare function isShippedFunctionFile(file: string): boolean;
 export declare function listFilesRecursive(dir: string): string[];
+/** A template function dir's shipped files, relative to `srcDir`. */
+export declare function shippedRelFiles(srcDir: string): string[];
 export declare function toRelativePosix(base: string, target: string): string;
 /** Resolves `dirRel` against `cwd`, throwing if it would escape the project root. */
 export declare function resolveContainedDir(cwd: string, dirRel: string): string;

package/lib/install-shared.js

@@ -46,6 +46,7 @@ exports.formatTimestamp = formatTimestamp;
 exports.addSeconds = addSeconds;
 exports.isShippedFunctionFile = isShippedFunctionFile;
 exports.listFilesRecursive = listFilesRecursive;
+exports.shippedRelFiles = shippedRelFiles;
 exports.toRelativePosix = toRelativePosix;
 exports.resolveContainedDir = resolveContainedDir;
 exports.settingsSeedSql = settingsSeedSql;
@@ -207,6 +208,12 @@ function listFilesRecursive(dir) {
     }
     return files;
 }
+/** A template function dir's shipped files, relative to `srcDir`. */
+function shippedRelFiles(srcDir) {
+    return listFilesRecursive(srcDir)
+        .filter(isShippedFunctionFile)
+        .map((f) => path.relative(srcDir, f));
+}
 function toRelativePosix(base, target) {
     return path.relative(base, target).split(path.sep).join("/");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocapine/community",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "CLI to install, upgrade and adopt the Rocapine Community SDK's Supabase backend (migrations, Edge Functions) into a project.",
   "license": "MIT",
   "repository": {