instant-cli 0.22.177 → 0.22.178

package/src/util/{mergeSchema.js → mergeSchema.ts}

@@ -1,11 +1,17 @@
 import * as acorn from 'acorn';
 import tsPlugin from 'acorn-typescript';
+import { Data } from 'effect';
 
+export class MergeSchemaError extends Data.TaggedError('MergeSchemaError')<{
+  message: string;
+}> {}
+
+// @ts-ignore
 const node = acorn.Parser.extend(tsPlugin({ dts: false }));
 
 // --- Import Handling Helpers ---
 
-function collectImports(ast) {
+function collectImports(ast: any) {
   const imports = new Map(); // localName -> { source, importedName, type, importKind }
 
   for (const node of ast.body) {
@@ -45,7 +51,7 @@ function collectImports(ast) {
   return imports;
 }
 
-function collectExistingImports(ast) {
+function collectExistingImports(ast: any) {
   const existing = new Map(); // source -> Set<localName>
 
   for (const node of ast.body) {
@@ -61,7 +67,7 @@ function collectExistingImports(ast) {
   return existing;
 }
 
-function findIdentifiers(node, set = new Set()) {
+function findIdentifiers(node: any, set: Set<string> = new Set<string>()) {
   if (!node) return set;
 
   // If it's a Type Reference, grab the name
@@ -96,13 +102,13 @@ function findIdentifiers(node, set = new Set()) {
 
 // --- Schema Traversal Helpers ---
 
-function getPropName(prop) {
+function getPropName(prop: any) {
   if (prop.key.type === 'Identifier') return prop.key.name;
   if (prop.key.type === 'Literal') return prop.key.value;
   return null;
 }
 
-function analyzeChain(node) {
+function analyzeChain(node: any): { typeParams: any; baseCall: any } {
   let curr = node;
   let typeParams = null;
   let baseCall = null;
@@ -129,7 +135,11 @@ function analyzeChain(node) {
   return { typeParams, baseCall };
 }
 
-function traverseSchema(node, path, callback) {
+function traverseSchema(
+  node: any,
+  path: string,
+  callback: (node: any, path: string) => void,
+) {
   if (node.type === 'ObjectExpression') {
     for (const prop of node.properties) {
       const name = getPropName(prop);
@@ -162,9 +172,9 @@ function traverseSchema(node, path, callback) {
   }
 }
 
-function findSchemaObject(ast) {
-  let schemaObj = null;
-  function walk(node) {
+function findSchemaObject(ast: any) {
+  let schemaObj: any = null;
+  function walk(node: any) {
     if (!node) return;
     if (schemaObj) return;
     if (
@@ -192,7 +202,7 @@ function findSchemaObject(ast) {
   return schemaObj;
 }
 
-export function mergeSchema(oldFile, newFile) {
+export function mergeSchema(oldFile: string, newFile: string): string {
   const oldParsed = node.parse(oldFile, {
     sourceType: 'module',
     ecmaVersion: 'latest',
@@ -210,7 +220,7 @@ export function mergeSchema(oldFile, newFile) {
   // 1. Extract from old file
   const oldSchemaObj = findSchemaObject(oldParsed);
   if (oldSchemaObj) {
-    traverseSchema(oldSchemaObj, '', (node, path) => {
+    traverseSchema(oldSchemaObj, '', (node: any, path: string) => {
       const { typeParams } = analyzeChain(node);
       if (typeParams) {
         const src = oldFile.slice(typeParams.start, typeParams.end);
@@ -222,14 +232,14 @@ export function mergeSchema(oldFile, newFile) {
   // 2. Collect Imports
   const oldImports = collectImports(oldParsed);
   const newExistingImports = collectExistingImports(newParsed);
-  const neededIdentifiers = new Set();
+  const neededIdentifiers = new Set<string>();
 
   // 3. Apply to new file & Collect needed identifiers
-  const edits = [];
+  const edits: any[] = [];
   const newSchemaObj = findSchemaObject(newParsed);
 
   if (newSchemaObj) {
-    traverseSchema(newSchemaObj, '', (node, path) => {
+    traverseSchema(newSchemaObj, '', (node: any, path: string) => {
       const { typeParams, baseCall } = analyzeChain(node);
       const stored = schemaMap.get(path);
 
@@ -290,7 +300,7 @@ export function mergeSchema(oldFile, newFile) {
     }
   }
 
-  const importBlocks = [];
+  const importBlocks: string[] = [];
 
   for (const [source, info] of importsToAdd) {
     // Check if source exists in new file to merge?
@@ -299,7 +309,7 @@ export function mergeSchema(oldFile, newFile) {
 
     // If we have named imports
     if (info.named.size > 0) {
-      const namedImports = Array.from(info.named.values());
+      const namedImports: any[] = Array.from(info.named.values());
       const allTypes = namedImports.every((x) => x.isType);
 
       if (allTypes) {

package/src/util/renamePrompt.ts

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
-import { ModifyOutputFn, Prompt, SelectState } from '../ui/lib.js';
+import { Prompt, SelectState } from '../ui/lib.ts';
+import type { ModifyOutputFn } from '../ui/lib.ts';
 import { isRenamePromptItem } from '@instantdb/platform';
 
 export interface RenamePromptItem<T> {

package/tsconfig.build.json

@@ -0,0 +1,20 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "rewriteRelativeImportExtensions": true,
+    "sourceMap": true,
+    "verbatimModuleSyntax": true,
+    "strict": true,
+    "skipLibCheck": true, // `unconfig` currently imports a broken type from `@antfu/utils`,
+    "plugins": [
+      {
+        "name": "@effect/language-service"
+      }
+    ],
+    "strictNullChecks": true
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
+}

package/tsconfig.json

@@ -1,13 +1,23 @@
 {
+  "$schema": "https://raw.githubusercontent.com/Effect-TS/language-service/refs/heads/main/schema.json",
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src",
+    "rewriteRelativeImportExtensions": true,
     "sourceMap": true,
-    "skipLibCheck": true, // `unconfig` currently imports a broken type from `@antfu/utils`,
-    "strictNullChecks": true
-    // remove once fixed
+    "skipLibCheck": true,
+    "incremental": true,
+    "composite": true,
+    "moduleDetection": "force",
+    "verbatimModuleSyntax": true,
+    "strictNullChecks": true,
+    "strict": true,
+    "plugins": [
+      {
+        "name": "@effect/language-service"
+      }
+    ]
   },
-  "include": ["src"],
+  "include": ["src", "__tests__"],
   "exclude": ["node_modules", "dist"]
 }

package/vitest.config.ts

@@ -7,13 +7,14 @@ export default defineConfig({
         test: {
           name: 'unit',
           include: ['**/*.test.ts'],
-          exclude: ['**/*.e2e.test.ts'],
+          exclude: ['**/*.e2e.test.ts', '**/node_modules/**'],
         },
       },
       {
         test: {
           name: 'e2e',
           include: ['**/*.e2e.test.ts'],
+          exclude: ['**/node_modules/**'],
         },
       },
     ],

package/dist/util/packageManager.d.ts

@@ -1,3 +0,0 @@
-export function detectPackageManager(destPath: any): Promise<any>;
-export function getInstallCommand(packageManager: any, moduleName: any): string;
-//# sourceMappingURL=packageManager.d.ts.map

package/dist/util/packageManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"packageManager.d.ts","sourceRoot":"","sources":["../../src/util/packageManager.js"],"names":[],"mappings":"AAOA,kEAoCC;AA0BD,gFAMC"}

package/dist/util/packageManager.js

@@ -1,70 +0,0 @@
-// Note:
-// Extracted the main logic for `detectPackageManager` from:
-// https://github.com/vercel/vercel/blob/eb7fe8a9266563cfeaf275cd77cd9fad3f17c92b/packages/build-utils/src/fs/run-user-scripts.ts
-import { pathExists, readJsonFile } from './fs.js';
-import path from 'path';
-async function detectPackageManager(destPath) {
-    const lockfileNames = {
-        'yarn.lock': 'yarn',
-        'package-lock.json': 'npm',
-        'pnpm-lock.yaml': 'pnpm',
-        'bun.lockb': 'bun',
-        'bun.lock': 'bun',
-    };
-    for (const dir of traverseUpDirectories(destPath)) {
-        for (const [lockfileName, cliType] of Object.entries(lockfileNames)) {
-            const lockfilePath = path.join(dir, lockfileName);
-            if (await pathExists(lockfilePath)) {
-                return cliType;
-            }
-        }
-        const packageJsonPath = path.join(dir, 'package.json');
-        if (await pathExists(packageJsonPath)) {
-            const packageJson = await readJsonFile(packageJsonPath);
-            if (packageJson.packageManager) {
-                const corepackPackageManager = parsePackageManagerField(packageJson.packageManager);
-                if (corepackPackageManager) {
-                    return corepackPackageManager.packageName;
-                }
-            }
-        }
-        if (dir === path.parse(dir).root) {
-            break;
-        }
-    }
-    return 'npm';
-}
-function* traverseUpDirectories(start) {
-    let current = path.resolve(start);
-    while (true) {
-        yield current;
-        const parent = path.dirname(current);
-        if (parent === current) {
-            break;
-        }
-        current = parent;
-    }
-}
-function parsePackageManagerField(packageManager) {
-    if (!packageManager)
-        return null;
-    const atIndex = packageManager.lastIndexOf('@');
-    if (atIndex <= 0)
-        return null; // '@' at position 0 is invalid
-    const packageName = packageManager.slice(0, atIndex);
-    const packageVersion = packageManager.slice(atIndex + 1);
-    if (!packageName || !packageVersion) {
-        return null;
-    }
-    return { packageName, packageVersion };
-}
-function getInstallCommand(packageManager, moduleName) {
-    if (packageManager === 'npm') {
-        return `npm install ${moduleName}`;
-    }
-    else {
-        return `${packageManager} add ${moduleName}`;
-    }
-}
-export { detectPackageManager, getInstallCommand };
-//# sourceMappingURL=packageManager.js.map

package/dist/util/packageManager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../src/util/packageManager.js"],"names":[],"mappings":"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","sourcesContent":["// Note:\n// Extracted the main logic for `detectPackageManager` from:\n// https://github.com/vercel/vercel/blob/eb7fe8a9266563cfeaf275cd77cd9fad3f17c92b/packages/build-utils/src/fs/run-user-scripts.ts\n\nimport { pathExists, readJsonFile } from './fs.js';\nimport path from 'path';\n\nasync function detectPackageManager(destPath) {\n  const lockfileNames = {\n    'yarn.lock': 'yarn',\n    'package-lock.json': 'npm',\n    'pnpm-lock.yaml': 'pnpm',\n    'bun.lockb': 'bun',\n    'bun.lock': 'bun',\n  };\n\n  for (const dir of traverseUpDirectories(destPath)) {\n    for (const [lockfileName, cliType] of Object.entries(lockfileNames)) {\n      const lockfilePath = path.join(dir, lockfileName);\n      if (await pathExists(lockfilePath)) {\n        return cliType;\n      }\n    }\n\n    const packageJsonPath = path.join(dir, 'package.json');\n    if (await pathExists(packageJsonPath)) {\n      const packageJson = await readJsonFile(packageJsonPath);\n      if (packageJson.packageManager) {\n        const corepackPackageManager = parsePackageManagerField(\n          packageJson.packageManager,\n        );\n        if (corepackPackageManager) {\n          return corepackPackageManager.packageName;\n        }\n      }\n    }\n\n    if (dir === path.parse(dir).root) {\n      break;\n    }\n  }\n\n  return 'npm';\n}\n\nfunction* traverseUpDirectories(start) {\n  let current = path.resolve(start);\n  while (true) {\n    yield current;\n    const parent = path.dirname(current);\n    if (parent === current) {\n      break;\n    }\n    current = parent;\n  }\n}\n\nfunction parsePackageManagerField(packageManager) {\n  if (!packageManager) return null;\n  const atIndex = packageManager.lastIndexOf('@');\n  if (atIndex <= 0) return null; // '@' at position 0 is invalid\n  const packageName = packageManager.slice(0, atIndex);\n  const packageVersion = packageManager.slice(atIndex + 1);\n  if (!packageName || !packageVersion) {\n    return null;\n  }\n  return { packageName, packageVersion };\n}\n\nfunction getInstallCommand(packageManager, moduleName) {\n  if (packageManager === 'npm') {\n    return `npm install ${moduleName}`;\n  } else {\n    return `${packageManager} add ${moduleName}`;\n  }\n}\n\nexport { detectPackageManager, getInstallCommand };\n"]}

package/dist/util/promptOk.d.ts

@@ -1,4 +0,0 @@
-import { OptionValues } from 'commander';
-import { UI } from '../ui/index.js';
-export declare function promptOk(props: UI.ConfirmationProps, opts?: OptionValues, defaultValue?: boolean): Promise<boolean>;
-//# sourceMappingURL=promptOk.d.ts.map

package/dist/util/promptOk.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"promptOk.d.ts","sourceRoot":"","sources":["../../src/util/promptOk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAgB,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAGlD,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,EAAE,CAAC,iBAAiB,EAC3B,IAAI,CAAC,EAAE,YAAY,EACnB,YAAY,GAAE,OAAc,oBAkB7B"}

package/dist/util/promptOk.js

@@ -1,18 +0,0 @@
-import { renderUnwrap, UI } from '../ui/index.js';
-import boxen from 'boxen';
-export async function promptOk(props, opts, defaultValue = true) {
-    if (opts?.yes)
-        return defaultValue;
-    return await renderUnwrap(new UI.Confirmation({
-        modifyOutput: (out) => boxen(out, {
-            dimBorder: true,
-            padding: {
-                left: 1,
-                right: 1,
-            },
-        }),
-        ...props,
-        defaultValue,
-    })).catch(() => defaultValue);
-}
-//# sourceMappingURL=promptOk.js.map

package/dist/util/promptOk.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"promptOk.js","sourceRoot":"","sources":["../../src/util/promptOk.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,KAA2B,EAC3B,IAAmB,EACnB,eAAwB,IAAI;IAE5B,IAAI,IAAI,EAAE,GAAG;QAAE,OAAO,YAAY,CAAC;IAEnC,OAAO,MAAM,YAAY,CACvB,IAAI,EAAE,CAAC,YAAY,CAAC;QAClB,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CACpB,KAAK,CAAC,GAAG,EAAE;YACT,SAAS,EAAE,IAAI;YACf,OAAO,EAAE;gBACP,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,CAAC;aACT;SACF,CAAC;QACJ,GAAG,KAAK;QACR,YAAY;KACb,CAAC,CACH,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC;AAC9B,CAAC","sourcesContent":["import { OptionValues } from 'commander';\nimport { renderUnwrap, UI } from '../ui/index.js';\nimport boxen from 'boxen';\n\nexport async function promptOk(\n  props: UI.ConfirmationProps,\n  opts?: OptionValues,\n  defaultValue: boolean = true,\n) {\n  if (opts?.yes) return defaultValue;\n\n  return await renderUnwrap(\n    new UI.Confirmation({\n      modifyOutput: (out) =>\n        boxen(out, {\n          dimBorder: true,\n          padding: {\n            left: 1,\n            right: 1,\n          },\n        }),\n      ...props,\n      defaultValue,\n    }),\n  ).catch(() => defaultValue);\n}\n"]}