@objectstack/cli 2.0.1 → 2.0.2

package/.turbo/turbo-build.log

@@ -1,24 +1,24 @@
 
-> @objectstack/cli@2.0.1 build /home/runner/work/spec/spec/packages/cli
+> @objectstack/cli@2.0.2 build /home/runner/work/spec/spec/packages/cli
 > tsup
 
-CLI Building entry: src/bin.ts
+CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.1
 CLI Using tsup config: /home/runner/work/spec/spec/packages/cli/tsup.config.ts
-CLI Building entry: src/index.ts
+CLI Building entry: src/bin.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.1
 CLI Using tsup config: /home/runner/work/spec/spec/packages/cli/tsup.config.ts
 CLI Target: es2022
-CLI Target: es2022
 ESM Build start
+CLI Target: es2022
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js 57.98 KB
-ESM ⚡️ Build success in 121ms
-ESM dist/bin.js 60.60 KB
-ESM ⚡️ Build success in 124ms
+ESM dist/index.js 58.65 KB
+ESM ⚡️ Build success in 169ms
+ESM dist/bin.js 61.27 KB
+ESM ⚡️ Build success in 152ms
 DTS Build start
-DTS ⚡️ Build success in 9822ms
+DTS ⚡️ Build success in 7598ms
 DTS dist/index.d.ts 2.93 KB

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @objectstack/cli
 
+## 2.0.2
+
+### Patch Changes
+
+- 1db8559: chore: exclude generated json-schema from git tracking
+
+  - Add `packages/spec/json-schema/` to `.gitignore` (1277 generated files, 5MB)
+  - JSON schema files are still generated during `pnpm build` and included in npm publish via `files` field
+  - Fix studio module resolution logic for better compatibility
+
+- Updated dependencies [1db8559]
+  - @objectstack/spec@2.0.2
+  - @objectstack/core@2.0.2
+  - @objectstack/objectql@2.0.2
+  - @objectstack/driver-memory@2.0.2
+  - @objectstack/plugin-hono-server@2.0.2
+  - @objectstack/rest@2.0.2
+  - @objectstack/runtime@2.0.2
+
 ## 2.0.1
 
 ### Patch Changes

package/dist/bin.js

@@ -1,13 +1,7 @@
 #!/usr/bin/env node
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
 
 // src/bin.ts
-import { createRequire } from "module";
+import { createRequire as createRequire2 } from "module";
 import { Command as Command12 } from "commander";
 import chalk13 from "chalk";
 
@@ -747,6 +741,8 @@ import { bundleRequire as bundleRequire2 } from "bundle-require";
 // src/utils/studio.ts
 import path6 from "path";
 import fs6 from "fs";
+import { createRequire } from "module";
+import { pathToFileURL } from "url";
 var STUDIO_PATH = "/_studio";
 function resolveStudioPath() {
   const cwd = process.cwd();
@@ -765,14 +761,25 @@ function resolveStudioPath() {
       }
     }
   }
-  try {
-    const { createRequire: createRequire2 } = __require("module");
-    const req = createRequire2(import.meta.url);
-    const resolved = req.resolve("@objectstack/studio/package.json");
-    return path6.dirname(resolved);
-  } catch {
-    return null;
+  const resolutionBases = [
+    pathToFileURL(path6.join(cwd, "package.json")).href,
+    // consumer workspace
+    import.meta.url
+    // CLI package itself
+  ];
+  for (const base of resolutionBases) {
+    try {
+      const req = createRequire(base);
+      const resolved = req.resolve("@objectstack/studio/package.json");
+      return path6.dirname(resolved);
+    } catch {
+    }
+  }
+  const directPath = path6.join(cwd, "node_modules", "@objectstack", "studio");
+  if (fs6.existsSync(path6.join(directPath, "package.json"))) {
+    return directPath;
   }
+  return null;
 }
 function hasStudioDist(studioPath) {
   return fs6.existsSync(path6.join(studioPath, "dist", "index.html"));
@@ -1082,6 +1089,28 @@ import chalk8 from "chalk";
 import path8 from "path";
 import fs8 from "fs";
 import { QA as CoreQA } from "@objectstack/core";
+function resolveGlob(pattern) {
+  if (!pattern.includes("*")) {
+    return fs8.existsSync(pattern) ? [pattern] : [];
+  }
+  const parts = pattern.split(path8.sep.replace("\\", "/"));
+  const segments = pattern.includes("/") ? pattern.split("/") : parts;
+  let baseDir = ".";
+  let globStart = 0;
+  for (let i = 0; i < segments.length; i++) {
+    if (segments[i].includes("*")) {
+      globStart = i;
+      break;
+    }
+    baseDir = i === 0 ? segments[i] : path8.join(baseDir, segments[i]);
+  }
+  if (!fs8.existsSync(baseDir)) return [];
+  const globPortion = segments.slice(globStart).join("/");
+  const regexStr = globPortion.replace(/\./g, "\\.").replace(/\*\*\//g, "(.+/)?").replace(/\*\*/g, ".*").replace(/\*/g, "[^/]*");
+  const regex = new RegExp(`^${regexStr}$`);
+  const entries = fs8.readdirSync(baseDir, { recursive: true, encoding: "utf-8" });
+  return entries.filter((entry) => regex.test(entry.replace(/\\/g, "/"))).map((entry) => path8.join(baseDir, entry)).filter((fullPath) => fs8.statSync(fullPath).isFile());
+}
 var testCommand = new Command7("test").description("Run Quality Protocol test scenarios against a running server").argument("[files]", 'Glob pattern for test files (e.g. "qa/*.test.json")', "qa/*.test.json").option("--url <url>", "Target base URL", "http://localhost:3000").option("--token <token>", "Authentication token").action(async (filesPattern, options) => {
   console.log(chalk8.bold(`
 \u{1F9EA} ObjectStack Quality Protocol Runner`));
@@ -1089,18 +1118,7 @@ var testCommand = new Command7("test").description("Run Quality Protocol test sc
   console.log(`Target: ${chalk8.blue(options.url)}`);
   const adapter = new CoreQA.HttpTestAdapter(options.url, options.token);
   const runner = new CoreQA.TestRunner(adapter);
-  const cwd = process.cwd();
-  const testFiles = [];
-  if (fs8.existsSync(filesPattern)) {
-    testFiles.push(filesPattern);
-  } else {
-    const dir = path8.dirname(filesPattern);
-    const ext = path8.extname(filesPattern);
-    if (fs8.existsSync(dir)) {
-      const files = fs8.readdirSync(dir).filter((f) => f.endsWith(ext) || f.endsWith(".json"));
-      files.forEach((f) => testFiles.push(path8.join(dir, f)));
-    }
-  }
+  const testFiles = resolveGlob(filesPattern);
   if (testFiles.length === 0) {
     console.warn(chalk8.yellow(`No test files found matching: ${filesPattern}`));
     return;
@@ -1850,7 +1868,7 @@ var generateCommand = new Command11("generate").alias("g").description("Generate
 });
 
 // src/bin.ts
-var require2 = createRequire(import.meta.url);
+var require2 = createRequire2(import.meta.url);
 var pkg = require2("../package.json");
 process.on("unhandledRejection", (err) => {
   console.error(chalk13.red(`

package/dist/index.js

@@ -1,10 +1,3 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/commands/compile.ts
 import { Command } from "commander";
 import path2 from "path";
@@ -1300,6 +1293,8 @@ import { bundleRequire as bundleRequire2 } from "bundle-require";
 // src/utils/studio.ts
 import path7 from "path";
 import fs7 from "fs";
+import { createRequire } from "module";
+import { pathToFileURL } from "url";
 var STUDIO_PATH = "/_studio";
 function resolveStudioPath() {
   const cwd = process.cwd();
@@ -1318,14 +1313,25 @@ function resolveStudioPath() {
       }
     }
   }
-  try {
-    const { createRequire } = __require("module");
-    const req = createRequire(import.meta.url);
-    const resolved = req.resolve("@objectstack/studio/package.json");
-    return path7.dirname(resolved);
-  } catch {
-    return null;
+  const resolutionBases = [
+    pathToFileURL(path7.join(cwd, "package.json")).href,
+    // consumer workspace
+    import.meta.url
+    // CLI package itself
+  ];
+  for (const base of resolutionBases) {
+    try {
+      const req = createRequire(base);
+      const resolved = req.resolve("@objectstack/studio/package.json");
+      return path7.dirname(resolved);
+    } catch {
+    }
   }
+  const directPath = path7.join(cwd, "node_modules", "@objectstack", "studio");
+  if (fs7.existsSync(path7.join(directPath, "package.json"))) {
+    return directPath;
+  }
+  return null;
 }
 function hasStudioDist(studioPath) {
   return fs7.existsSync(path7.join(studioPath, "dist", "index.html"));
@@ -1610,6 +1616,28 @@ import chalk11 from "chalk";
 import path9 from "path";
 import fs9 from "fs";
 import { QA as CoreQA } from "@objectstack/core";
+function resolveGlob(pattern) {
+  if (!pattern.includes("*")) {
+    return fs9.existsSync(pattern) ? [pattern] : [];
+  }
+  const parts = pattern.split(path9.sep.replace("\\", "/"));
+  const segments = pattern.includes("/") ? pattern.split("/") : parts;
+  let baseDir = ".";
+  let globStart = 0;
+  for (let i = 0; i < segments.length; i++) {
+    if (segments[i].includes("*")) {
+      globStart = i;
+      break;
+    }
+    baseDir = i === 0 ? segments[i] : path9.join(baseDir, segments[i]);
+  }
+  if (!fs9.existsSync(baseDir)) return [];
+  const globPortion = segments.slice(globStart).join("/");
+  const regexStr = globPortion.replace(/\./g, "\\.").replace(/\*\*\//g, "(.+/)?").replace(/\*\*/g, ".*").replace(/\*/g, "[^/]*");
+  const regex = new RegExp(`^${regexStr}$`);
+  const entries = fs9.readdirSync(baseDir, { recursive: true, encoding: "utf-8" });
+  return entries.filter((entry) => regex.test(entry.replace(/\\/g, "/"))).map((entry) => path9.join(baseDir, entry)).filter((fullPath) => fs9.statSync(fullPath).isFile());
+}
 var testCommand = new Command9("test").description("Run Quality Protocol test scenarios against a running server").argument("[files]", 'Glob pattern for test files (e.g. "qa/*.test.json")', "qa/*.test.json").option("--url <url>", "Target base URL", "http://localhost:3000").option("--token <token>", "Authentication token").action(async (filesPattern, options) => {
   console.log(chalk11.bold(`
 \u{1F9EA} ObjectStack Quality Protocol Runner`));
@@ -1617,18 +1645,7 @@ var testCommand = new Command9("test").description("Run Quality Protocol test sc
   console.log(`Target: ${chalk11.blue(options.url)}`);
   const adapter = new CoreQA.HttpTestAdapter(options.url, options.token);
   const runner = new CoreQA.TestRunner(adapter);
-  const cwd = process.cwd();
-  const testFiles = [];
-  if (fs9.existsSync(filesPattern)) {
-    testFiles.push(filesPattern);
-  } else {
-    const dir = path9.dirname(filesPattern);
-    const ext = path9.extname(filesPattern);
-    if (fs9.existsSync(dir)) {
-      const files = fs9.readdirSync(dir).filter((f) => f.endsWith(ext) || f.endsWith(".json"));
-      files.forEach((f) => testFiles.push(path9.join(dir, f)));
-    }
-  }
+  const testFiles = resolveGlob(filesPattern);
   if (testFiles.length === 0) {
     console.warn(chalk11.yellow(`No test files found matching: ${filesPattern}`));
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectstack/cli",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Command Line Interface for ObjectStack Protocol",
   "main": "dist/index.js",
   "bin": {
@@ -21,20 +21,20 @@
     "chalk": "^5.3.0",
     "commander": "^14.0.3",
     "tsx": "^4.7.1",
-    "zod": "^3.24.1",
-    "@objectstack/core": "2.0.1",
-    "@objectstack/driver-memory": "^2.0.1",
-    "@objectstack/objectql": "^2.0.1",
-    "@objectstack/plugin-hono-server": "2.0.1",
-    "@objectstack/rest": "2.0.1",
-    "@objectstack/runtime": "^2.0.1",
-    "@objectstack/spec": "2.0.1"
+    "zod": "^4.3.6",
+    "@objectstack/core": "2.0.2",
+    "@objectstack/driver-memory": "^2.0.2",
+    "@objectstack/objectql": "^2.0.2",
+    "@objectstack/plugin-hono-server": "2.0.2",
+    "@objectstack/rest": "2.0.2",
+    "@objectstack/runtime": "^2.0.2",
+    "@objectstack/spec": "2.0.2"
   },
   "peerDependencies": {
-    "@objectstack/core": "2.0.1"
+    "@objectstack/core": "2.0.2"
   },
   "devDependencies": {
-    "@types/node": "^25.1.0",
+    "@types/node": "^25.2.2",
     "tsup": "^8.0.2",
     "typescript": "^5.3.3",
     "vitest": "^4.0.18"

package/src/commands/test.ts

@@ -7,6 +7,51 @@ import fs from 'fs';
 import { QA as CoreQA } from '@objectstack/core';
 import { QA } from '@objectstack/spec';
 
+/**
+ * Resolve a glob-like pattern to matching file paths.
+ * Supports `*` (single segment wildcard) and `**` (recursive wildcard).
+ * Falls back to direct file path if no glob characters are present.
+ */
+function resolveGlob(pattern: string): string[] {
+  // Direct file path — no wildcards
+  if (!pattern.includes('*')) {
+    return fs.existsSync(pattern) ? [pattern] : [];
+  }
+
+  // Split pattern into the static base directory and the glob portion
+  const parts = pattern.split(path.sep.replace('\\', '/'));
+  // Also handle forward-slash on Windows
+  const segments = pattern.includes('/') ? pattern.split('/') : parts;
+
+  let baseDir = '.';
+  let globStart = 0;
+  for (let i = 0; i < segments.length; i++) {
+    if (segments[i].includes('*')) {
+      globStart = i;
+      break;
+    }
+    baseDir = i === 0 ? segments[i] : path.join(baseDir, segments[i]);
+  }
+
+  if (!fs.existsSync(baseDir)) return [];
+
+  // Convert the glob portion into a RegExp
+  const globPortion = segments.slice(globStart).join('/');
+  const regexStr = globPortion
+    .replace(/\./g, '\\.')           // escape dots
+    .replace(/\*\*\//g, '(.+/)?')   // ** matches any directory depth
+    .replace(/\*\*/g, '.*')         // trailing ** without slash
+    .replace(/\*/g, '[^/]*');       // * matches within a single segment
+  const regex = new RegExp(`^${regexStr}$`);
+
+  // Recursively read all files under baseDir
+  const entries = fs.readdirSync(baseDir, { recursive: true, encoding: 'utf-8' }) as string[];
+  return entries
+    .filter(entry => regex.test(entry.replace(/\\/g, '/')))
+    .map(entry => path.join(baseDir, entry))
+    .filter(fullPath => fs.statSync(fullPath).isFile());
+}
+
 export const testCommand = new Command('test')
   .description('Run Quality Protocol test scenarios against a running server')
   .argument('[files]', 'Glob pattern for test files (e.g. "qa/*.test.json")', 'qa/*.test.json')
@@ -21,23 +66,8 @@ export const testCommand = new Command('test')
     const adapter = new CoreQA.HttpTestAdapter(options.url, options.token);
     const runner = new CoreQA.TestRunner(adapter);
 
-    // 2. Find Files (Simple implementation for now)
-    // TODO: Use glob
-    const cwd = process.cwd();
-    const testFiles: string[] = [];
-    
-    // Very basic file finding for demo - assume explicit path or check local dir
-    if (fs.existsSync(filesPattern)) {
-        testFiles.push(filesPattern);
-    } else {
-        // Simple directory scan
-        const dir = path.dirname(filesPattern);
-        const ext = path.extname(filesPattern);
-        if (fs.existsSync(dir)) {
-            const files = fs.readdirSync(dir).filter(f => f.endsWith(ext) || f.endsWith('.json'));
-            files.forEach(f => testFiles.push(path.join(dir, f)));
-        }
-    }
+    // 2. Find test files using glob-style pattern matching
+    const testFiles: string[] = resolveGlob(filesPattern);
 
     if (testFiles.length === 0) {
         console.warn(chalk.yellow(`No test files found matching: ${filesPattern}`));

package/src/utils/studio.ts

@@ -9,6 +9,8 @@
 import path from 'path';
 import fs from 'fs';
 import net from 'net';
+import { createRequire } from 'module';
+import { pathToFileURL } from 'url';
 import { spawn, type ChildProcess } from 'child_process';
 import chalk from 'chalk';
 
@@ -48,15 +50,31 @@ export function resolveStudioPath(): string | null {
     }
   }
 
-  // Fallback: resolve from node_modules
-  try {
-    const { createRequire } = require('module');
-    const req = createRequire(import.meta.url);
-    const resolved = req.resolve('@objectstack/studio/package.json');
-    return path.dirname(resolved);
-  } catch {
-    return null;
+  // Fallback: resolve from node_modules via createRequire.
+  // Try the consumer's cwd first (pnpm strict isolation means the CLI's own
+  // import.meta.url cannot see the consumer's dependencies), then the CLI itself.
+  const resolutionBases = [
+    pathToFileURL(path.join(cwd, 'package.json')).href,  // consumer workspace
+    import.meta.url,                                       // CLI package itself
+  ];
+
+  for (const base of resolutionBases) {
+    try {
+      const req = createRequire(base);
+      const resolved = req.resolve('@objectstack/studio/package.json');
+      return path.dirname(resolved);
+    } catch {
+      // Not resolvable from this base — try next
+    }
   }
+
+  // Last resort: direct filesystem check in cwd/node_modules
+  const directPath = path.join(cwd, 'node_modules', '@objectstack', 'studio');
+  if (fs.existsSync(path.join(directPath, 'package.json'))) {
+    return directPath;
+  }
+
+  return null;
 }
 
 /**