@stoker-platform/cli 0.5.51 → 0.5.53

package/init-files/bin/build.js

@@ -116,67 +116,6 @@ try {
     filteredLines.push(`DATABASE_REGION=${databaseRegion.split("=")[1].replace(/^"|"$/g, "")}`)
     await writeFile(join(__dirname, "..", "extensions", "firestore-send-email.env"), filteredLines.join("\n"))
 
-    // Update dependencies according to external.package.json
-
-    const updateDependencies = async (packageJsonPath, externalDeps) => {
-        const packageJsonRaw = await readFile(packageJsonPath, "utf8")
-        const packageJson = JSON.parse(packageJsonRaw)
-
-        const dependencies = packageJson.dependencies || {}
-        const previouslyManaged = packageJson.stokerExternalPackages || {}
-
-        let changed = false
-
-        for (const managedName of Object.keys(previouslyManaged)) {
-            if (!Object.prototype.hasOwnProperty.call(externalDeps, managedName)) {
-                if (Object.prototype.hasOwnProperty.call(dependencies, managedName)) {
-                    delete dependencies[managedName]
-                    changed = true
-                }
-            }
-        }
-
-        for (const [depName, depVersion] of Object.entries(externalDeps)) {
-            if (dependencies[depName] !== depVersion) {
-                dependencies[depName] = depVersion
-                changed = true
-            }
-        }
-
-        packageJson.dependencies = dependencies
-        packageJson.stokerExternalPackages = externalDeps
-
-        if (changed || JSON.stringify(previouslyManaged) !== JSON.stringify(externalDeps)) {
-            await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 4) + "\n")
-        }
-
-        return changed
-    }
-
-    const externalPackagesPath = join(process.cwd(), "external.package.json")
-    if (existsSync(externalPackagesPath)) {
-        const externalRaw = await readFile(externalPackagesPath, "utf8")
-        const external = JSON.parse(externalRaw)
-        const serverDeps = external.server || {}
-        const webDeps = external.web || {}
-
-        const appDir = join(process.cwd())
-        const functionsDir = join(process.cwd(), "functions")
-
-        const appPackageJson = join(appDir, "package.json")
-        const functionsPackageJson = join(functionsDir, "package.json")
-
-        const appChanged = await updateDependencies(appPackageJson, { ...serverDeps, ...webDeps })
-        const functionsChanged = await updateDependencies(functionsPackageJson, serverDeps)
-
-        if (appChanged) {
-            await runChildProcess("npm", ["install", "--no-audit", "--no-fund"], appDir)
-        }
-        if (functionsChanged) {
-            await runChildProcess("npm", ["install", "--no-audit", "--no-fund"], functionsDir)
-        }
-    }
-
     // Create functions .env file with filtered environment variables
 
     const functionsEnvPath = join(process.cwd(), "functions", ".env")

package/init-files/bin/install.js

@@ -0,0 +1,65 @@
+#!/usr/bin/env -S node --no-warnings
+
+import { readFile, writeFile } from "fs/promises"
+import { join } from "path"
+import { existsSync } from "fs"
+import { runChildProcess } from "@stoker-platform/node-client"
+
+const updateDependencies = async (packageJsonPath, externalDeps) => {
+    const packageJsonRaw = await readFile(packageJsonPath, "utf8")
+    const packageJson = JSON.parse(packageJsonRaw)
+
+    const dependencies = packageJson.dependencies || {}
+    const previouslyManaged = packageJson.stokerExternalPackages || {}
+
+    let changed = false
+
+    for (const managedName of Object.keys(previouslyManaged)) {
+        if (!Object.prototype.hasOwnProperty.call(externalDeps, managedName)) {
+            if (Object.prototype.hasOwnProperty.call(dependencies, managedName)) {
+                delete dependencies[managedName]
+                changed = true
+            }
+        }
+    }
+
+    for (const [depName, depVersion] of Object.entries(externalDeps)) {
+        if (dependencies[depName] !== depVersion) {
+            dependencies[depName] = depVersion
+            changed = true
+        }
+    }
+
+    packageJson.dependencies = dependencies
+    packageJson.stokerExternalPackages = externalDeps
+
+    if (changed || JSON.stringify(previouslyManaged) !== JSON.stringify(externalDeps)) {
+        await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 4) + "\n")
+    }
+
+    return changed
+}
+
+const externalPackagesPath = join(process.cwd(), "external.package.json")
+if (existsSync(externalPackagesPath)) {
+    const externalRaw = await readFile(externalPackagesPath, "utf8")
+    const external = JSON.parse(externalRaw)
+    const serverDeps = external.server || {}
+    const webDeps = external.web || {}
+
+    const appDir = join(process.cwd())
+    const functionsDir = join(process.cwd(), "functions")
+
+    const appPackageJson = join(appDir, "package.json")
+    const functionsPackageJson = join(functionsDir, "package.json")
+
+    const appChanged = await updateDependencies(appPackageJson, { ...serverDeps, ...webDeps })
+    const functionsChanged = await updateDependencies(functionsPackageJson, serverDeps)
+
+    if (appChanged) {
+        await runChildProcess("npm", ["install", "--no-audit", "--no-fund"], appDir)
+    }
+    if (functionsChanged) {
+        await runChildProcess("npm", ["install", "--no-audit", "--no-fund"], functionsDir)
+    }
+}

package/init-files/package.json

@@ -15,7 +15,7 @@
         "format": "prettier . --write",
         "lint": "tsc --noEmit && eslint . && npm --prefix functions run lint",
         "prebuild": "npm run clean:lib && npm run clean:functions",
-        "build": "tsc && node bin/build.js && node bin/shim.js && npm --prefix functions run build",
+        "build": "node bin/install.js && tsc && node bin/build.js && node bin/shim.js && npm --prefix functions run build",
         "test": "vitest --run",
         "admin-emulators": "export FIREBASE_AUTH_EMULATOR_HOST='127.0.0.1:9099' && export FIREBASE_DATABASE_EMULATOR_HOST='127.0.0.1:9000' && export FIRESTORE_EMULATOR_HOST='127.0.0.1:8080' && export FIREBASE_STORAGE_EMULATOR_HOST='127.0.0.1:9199'"
     },

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/cli",
-    "version": "0.5.51",
+    "version": "0.5.53",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "./lib/src/main.js",
@@ -24,9 +24,9 @@
         "@google-cloud/secret-manager": "^6.1.1",
         "@google-cloud/storage": "^7.19.0",
         "@inquirer/prompts": "^8.3.2",
-        "@stoker-platform/node-client": "0.5.39",
+        "@stoker-platform/node-client": "0.5.40",
         "@stoker-platform/types": "0.5.27",
-        "@stoker-platform/utils": "0.5.33",
+        "@stoker-platform/utils": "0.5.34",
         "algoliasearch": "^5.50.0",
         "commander": "^14.0.0",
         "cross-spawn": "^7.0.6",

package/lib/src/lint/lintSchema.js

@@ -292,11 +292,8 @@ export const lintSchema = async (noLog = false) => {
                                 }
                             }
                             if (relation.loadAll) {
-                                if (relationCollection.parentCollection) {
-                                    errors.push(`Collection ${collectionName} has a relation list for collection ${relation.collection} that has loadAll enabled but is on a subcollection`);
-                                }
-                                if (relationCollection.indexExemption) {
-                                    errors.push(`Collection ${collectionName} has a relation list for collection ${relation.collection} that has loadAll enabled but is on a collection with indexExemption enabled`);
+                                if (!["OneToOne", "OneToMany"].includes(relationField.type)) {
+                                    errors.push(`Collection ${collectionName} has a relation list for collection ${relation.collection} that has loadAll enabled but is not a one to one or one to many field`);
                                 }
                             }
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stoker-platform/cli",
-    "version": "0.5.51",
+    "version": "0.5.53",
     "type": "module",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "./lib/src/main.js",
@@ -24,9 +24,9 @@
         "@google-cloud/secret-manager": "^6.1.1",
         "@google-cloud/storage": "^7.19.0",
         "@inquirer/prompts": "^8.3.2",
-        "@stoker-platform/node-client": "0.5.39",
+        "@stoker-platform/node-client": "0.5.40",
         "@stoker-platform/types": "0.5.27",
-        "@stoker-platform/utils": "0.5.33",
+        "@stoker-platform/utils": "0.5.34",
         "algoliasearch": "^5.50.0",
         "commander": "^14.0.0",
         "cross-spawn": "^7.0.6",