instant-cli 1.0.40 → 1.0.41-branch-python-sdk-v1.26586025551.1

package/dist/util/projectDir.js

@@ -1,21 +1,43 @@
 import { packageDirectory } from 'package-directory';
 import { findUp } from 'find-up-simple';
 import path from 'node:path';
+// Same-directory tie-breaker: Deno > Python > Node. Deno may coexist
+// with package.json for npm interop; pyproject.toml signals Python.
+const TYPE_PRIORITY = {
+    deno: 0,
+    python: 1,
+    node: 2,
+};
+const depth = (filepath) => filepath.split(path.sep).length;
 export async function findProjectDir(cwd) {
-    // Check for Deno first. A Deno project may also have a package.json (for npm
-    // compatibility), but if deno.json exists, the user intends to use Deno and
-    // we should use Deno-specific behavior (e.g., resolving @instantdb/* from
-    // CLI's dependencies instead of node_modules).
-    const denoConfig = (await findUp('deno.json', { cwd })) ||
-        (await findUp('deno.jsonc', { cwd }));
-    if (denoConfig) {
-        return { dir: path.dirname(denoConfig), type: 'deno' };
-    }
-    // Fall back to package-directory for Node
-    const nodeDir = await packageDirectory({ cwd });
+    const [denoJson, denoJsonc, pyproject, nodeDir] = await Promise.all([
+        findUp('deno.json', { cwd }),
+        findUp('deno.jsonc', { cwd }),
+        findUp('pyproject.toml', { cwd }),
+        packageDirectory({ cwd }),
+    ]);
+    // Push deno.json and deno.jsonc independently so the depth-sort can
+    // pick the nearer one when both exist at different levels.
+    const candidates = [];
+    if (denoJson)
+        candidates.push({ file: denoJson, type: 'deno' });
+    if (denoJsonc)
+        candidates.push({ file: denoJsonc, type: 'deno' });
+    if (pyproject)
+        candidates.push({ file: pyproject, type: 'python' });
     if (nodeDir) {
-        return { dir: nodeDir, type: 'node' };
+        candidates.push({ file: path.join(nodeDir, 'package.json'), type: 'node' });
     }
-    return null;
+    if (candidates.length === 0)
+        return null;
+    // Nearest marker wins (deepest path), so a Python project nested in a
+    // Node monorepo isn't misclassified by a parent's package.json.
+    candidates.sort((a, b) => {
+        const depthDiff = depth(b.file) - depth(a.file);
+        return depthDiff !== 0
+            ? depthDiff
+            : TYPE_PRIORITY[a.type] - TYPE_PRIORITY[b.type];
+    });
+    return { dir: path.dirname(candidates[0].file), type: candidates[0].type };
 }
 //# sourceMappingURL=projectDir.js.map

package/dist/util/projectDir.js.map

@@ -1 +1 @@
-{"version":3,"file":"projectDir.js","sourceRoot":"","sources":["../../src/util/projectDir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAS7B,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAY;IAEZ,6EAA6E;IAC7E,4EAA4E;IAC5E,0EAA0E;IAC1E,+CAA+C;IAC/C,MAAM,UAAU,GACd,CAAC,MAAM,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACpC,CAAC,MAAM,MAAM,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACxC,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACzD,CAAC;IAED,0CAA0C;IAC1C,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAChD,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACxC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import { packageDirectory } from 'package-directory';\nimport { findUp } from 'find-up-simple';\nimport path from 'node:path';\n\nexport type ProjectType = 'node' | 'deno';\n\nexport interface ProjectInfo {\n  dir: string;\n  type: ProjectType;\n}\n\nexport async function findProjectDir(\n  cwd?: string,\n): Promise<ProjectInfo | null> {\n  // Check for Deno first. A Deno project may also have a package.json (for npm\n  // compatibility), but if deno.json exists, the user intends to use Deno and\n  // we should use Deno-specific behavior (e.g., resolving @instantdb/* from\n  // CLI's dependencies instead of node_modules).\n  const denoConfig =\n    (await findUp('deno.json', { cwd })) ||\n    (await findUp('deno.jsonc', { cwd }));\n  if (denoConfig) {\n    return { dir: path.dirname(denoConfig), type: 'deno' };\n  }\n\n  // Fall back to package-directory for Node\n  const nodeDir = await packageDirectory({ cwd });\n  if (nodeDir) {\n    return { dir: nodeDir, type: 'node' };\n  }\n\n  return null;\n}\n"]}
+{"version":3,"file":"projectDir.js","sourceRoot":"","sources":["../../src/util/projectDir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAS7B,qEAAqE;AACrE,oEAAoE;AACpE,MAAM,aAAa,GAAgC;IACjD,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;CACR,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,QAAgB,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;AAEpE,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAY;IAEZ,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClE,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC;QAC5B,MAAM,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE,CAAC;QAC7B,MAAM,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,CAAC;QACjC,gBAAgB,CAAC,EAAE,GAAG,EAAE,CAAC;KAC1B,CAAC,CAAC;IAEH,oEAAoE;IACpE,2DAA2D;IAC3D,MAAM,UAAU,GAA0C,EAAE,CAAC;IAC7D,IAAI,QAAQ;QAAE,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAChE,IAAI,SAAS;QAAE,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,IAAI,SAAS;QAAE,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACpE,IAAI,OAAO,EAAE,CAAC;QACZ,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzC,sEAAsE;IACtE,gEAAgE;IAChE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACvB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,SAAS,KAAK,CAAC;YACpB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC7E,CAAC","sourcesContent":["import { packageDirectory } from 'package-directory';\nimport { findUp } from 'find-up-simple';\nimport path from 'node:path';\n\nexport type ProjectType = 'node' | 'deno' | 'python';\n\nexport interface ProjectInfo {\n  dir: string;\n  type: ProjectType;\n}\n\n// Same-directory tie-breaker: Deno > Python > Node. Deno may coexist\n// with package.json for npm interop; pyproject.toml signals Python.\nconst TYPE_PRIORITY: Record<ProjectType, number> = {\n  deno: 0,\n  python: 1,\n  node: 2,\n};\n\nconst depth = (filepath: string) => filepath.split(path.sep).length;\n\nexport async function findProjectDir(\n  cwd?: string,\n): Promise<ProjectInfo | null> {\n  const [denoJson, denoJsonc, pyproject, nodeDir] = await Promise.all([\n    findUp('deno.json', { cwd }),\n    findUp('deno.jsonc', { cwd }),\n    findUp('pyproject.toml', { cwd }),\n    packageDirectory({ cwd }),\n  ]);\n\n  // Push deno.json and deno.jsonc independently so the depth-sort can\n  // pick the nearer one when both exist at different levels.\n  const candidates: { file: string; type: ProjectType }[] = [];\n  if (denoJson) candidates.push({ file: denoJson, type: 'deno' });\n  if (denoJsonc) candidates.push({ file: denoJsonc, type: 'deno' });\n  if (pyproject) candidates.push({ file: pyproject, type: 'python' });\n  if (nodeDir) {\n    candidates.push({ file: path.join(nodeDir, 'package.json'), type: 'node' });\n  }\n\n  if (candidates.length === 0) return null;\n\n  // Nearest marker wins (deepest path), so a Python project nested in a\n  // Node monorepo isn't misclassified by a parent's package.json.\n  candidates.sort((a, b) => {\n    const depthDiff = depth(b.file) - depth(a.file);\n    return depthDiff !== 0\n      ? depthDiff\n      : TYPE_PRIORITY[a.type] - TYPE_PRIORITY[b.type];\n  });\n\n  return { dir: path.dirname(candidates[0].file), type: candidates[0].type };\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "instant-cli",
   "type": "module",
-  "version": "1.0.40",
+  "version": "1.0.41-branch-python-sdk-v1.26586025551.1",
   "description": "Instant's CLI",
   "license": "Apache-2.0",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/cli",
@@ -16,7 +16,8 @@
         "types": "./dist/ui/index.d.ts",
         "default": "./dist/ui/index.js"
       }
-    }
+    },
+    "./bin/index.js": "./bin/index.js"
   },
   "bin": {
     "instant-cli": "bin/index.js"
@@ -50,9 +51,9 @@
     "strip-ansi": "^7.1.2",
     "supports-hyperlinks": "^4.4.0",
     "unconfig": "^7.5.0",
-    "@instantdb/core": "1.0.40",
-    "@instantdb/platform": "1.0.40",
-    "@instantdb/version": "1.0.40"
+    "@instantdb/platform": "1.0.41-branch-python-sdk-v1.26586025551.1",
+    "@instantdb/version": "1.0.41-branch-python-sdk-v1.26586025551.1",
+    "@instantdb/core": "1.0.41-branch-python-sdk-v1.26586025551.1"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",